Commit Graph

11405 Commits

Author SHA1 Message Date
The Android Open Source Project 2db5636452 am d1b25b86: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit 'd1b25b86ad8eca832ccb1af43e3992d9441b8bfc':
  JDP75
  JDP74
  JDP73
2012-12-14 16:48:43 -08:00
Ying Wang 3a990aee1e Merge "Build from source or prebuilt" 2012-12-14 14:52:16 -08:00
Ying Wang 63d94fa305 Build from source or prebuilt
With this change, you can easily switch between building from source
code and prebuilt.
Set LOCAL_PREBUILT_MODULE_FILE to the path of the prebuilt file,
relative to the top of the source tree, in the usual module definition.
The prebuilt will be used unless any of the followings satisfied:
1) ANDROID_BUILD_FROM_SOURCE is "true", which disable prebuilt globally;
2) The module name is in ANDROID_NO_PREBUILT_MODULES;
3) The LOCAL_PATH is prefixed by any of ANDROID_NO_PREBUILT_PATHS.
A developer can set ANDROID_NO_PREBUILT_MODULES or
ANDROID_NO_PREBUILT_PATHS to build only his own module(s) from source,
while build other modules from prebuilts.
You can set ANDROID_BUILD_FROM_SOURCE to true to build everything from
source.
Those variables can be set with shell environmental variable or in your
buildspec.mk.

Sometimes module B is able to be built from source only if module A is
also
built from source, for example, if B is the test apk of A.
In that case, you can use the macro include-if-build-from-source to
include B's Android.mk only if A is built from source too, or
if-build-from-source to conditionally include the definition of module
B,
if their module definitions are in the same Android.mk.

Support host-executable-hook and host-shared-library-hook.

Change-Id: Icab7cf028c87eaba0dd7efc2a7749fd6f32b44e4
2012-12-14 14:48:00 -08:00
The Android Open Source Project d1b25b86ad Reconcile with jb-mr1.1-release - do not merge
Change-Id: I9499ee080c842e363f7aa78057f714dd3e32d43d
2012-12-14 14:03:11 -08:00
The Android Automerger 20bfc920bf JDP75 2012-12-14 13:56:39 -08:00
The Android Automerger 9d1c9df4ea merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-14 13:56:02 -08:00
Stephen Hines 08d58814c3 Merge "Add -nostdlib to RS bc->so linker command line." 2012-12-14 11:39:29 -08:00
Stephen Hines 7d6ec71965 Add -nostdlib to RS bc->so linker command line.
Change-Id: Ic715060c3d037ec9fecb0ad9b2be6c2e7052ce0a
2012-12-13 19:24:50 -08:00
Ying Wang 51b5840de7 am 0adc185a: am 9eedd3ab: Merge "Use "\cd" to disable alias temporarily."
* commit '0adc185a8cf117c5c7edda7cf5a8257343948342':
  Use "\cd" to disable alias temporarily.
2012-12-13 18:00:14 -08:00
Ben Cheng 780a916e1d am 24b321b1: am 5ece4724: Merge "Enable lunch command to pick up new toolchain version."
* commit '24b321b15cb1fe31cc1432f868b740686194bca7':
  Enable lunch command to pick up new toolchain version.
2012-12-13 18:00:13 -08:00
Ying Wang 0adc185a8c am 9eedd3ab: Merge "Use "\cd" to disable alias temporarily."
* commit '9eedd3abed1d38ac5639a1f47ee80a7dbd0fb207':
  Use "\cd" to disable alias temporarily.
2012-12-13 15:51:30 -08:00
Ben Cheng 24b321b15c am 5ece4724: Merge "Enable lunch command to pick up new toolchain version."
* commit '5ece4724d19712225d4fbb6d91d86619015d81b3':
  Enable lunch command to pick up new toolchain version.
2012-12-13 15:51:29 -08:00
The Android Automerger 127f6a2fd4 JDP74 2012-12-13 15:31:33 -08:00
The Android Automerger c79811b516 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-13 15:30:36 -08:00
Ying Wang 9eedd3abed Merge "Use "\cd" to disable alias temporarily." 2012-12-13 11:08:38 -08:00
Ben Cheng 9c68f06a54 Merge commit 'ec4caba7' into manualmerge
Conflicts:
	CleanSpec.mk

Change-Id: Idd8f8f4a896b47bd6275daeb71a24a317da4c98a
2012-12-13 11:03:58 -08:00
Ying Wang 9cd1764814 Use "\cd" to disable alias temporarily.
http://code.google.com/p/android/issues/detail?id=41372

Change-Id: I78e468cb5d57e51774d2e42376ef1f4b52096d33
2012-12-13 10:52:56 -08:00
Ben Cheng ec4caba79c Enable lunch command to pick up new toolchain version.
Otherwise the previously exported value will be sticky and the value
defined in the TARGET makefile is ignored.

Change-Id: Icdacb8c46034b8a24a9875b7596b31d00861512a
2012-12-13 10:43:55 -08:00
Ben Cheng 5ece4724d1 Merge "Enable lunch command to pick up new toolchain version." 2012-12-13 10:11:21 -08:00
Ben Cheng 914f7fd938 Enable lunch command to pick up new toolchain version.
Otherwise the previously exported value will be sticky and the value
defined in the TARGET makefile is ignored.

Change-Id: I13b9cca2d288f7ab09104c57e7cad9f23de2548a
2012-12-12 21:56:58 -08:00
The Android Automerger ba45cc19c9 JDP73 2012-12-12 15:06:52 -08:00
The Android Automerger 082e6dcd9a merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-12 15:06:00 -08:00
Stephen Hines 0f28a1d90c Merge "Build rules for Renderscript compatibility library." 2012-12-12 15:01:46 -08:00
Stephen Hines e719f28d93 Build rules for Renderscript compatibility library.
Bug: 7419958
Change-Id: I2e0f0bb632e6ff22b2cf1a1b96b28364637995cc
2012-12-12 14:58:02 -08:00
Nick Kralevich cced518b1e It's a new version!
Change-Id: I97ba954c8726ae3b64c43260ce221642d5865c6d
2012-12-12 13:41:54 -08:00
Ben Cheng 2657938bf3 am e881cab1: am 98ce73b2: (-s ours) Merge "Refresh ARM toolchain to GCC 4.7 / binutils 2.22."
* commit 'e881cab16047fd31745dde210834c1ab7a41049d':
  Refresh ARM toolchain to GCC 4.7 / binutils 2.22.
2012-12-12 09:57:38 -08:00
Ben Cheng e881cab160 am 98ce73b2: (-s ours) Merge "Refresh ARM toolchain to GCC 4.7 / binutils 2.22."
* commit '98ce73b27a9df7795cc91ea9ca5781d3255828c7':
  Refresh ARM toolchain to GCC 4.7 / binutils 2.22.
2012-12-12 09:55:55 -08:00
Ben Cheng 98ce73b27a Merge "Refresh ARM toolchain to GCC 4.7 / binutils 2.22." 2012-12-12 09:33:13 -08:00
The Android Open Source Project ad0c2e5df9 am cbc0968f: (-s ours) am b3e8a615: am 16cb8655: Reconcile with jb-mr1-release - do not merge
* commit 'cbc0968f602c15692200c827fe78944d1f528654':
  JOP40F
2012-12-12 07:45:29 -08:00
The Android Open Source Project cbc0968f60 am b3e8a615: am 16cb8655: Reconcile with jb-mr1-release - do not merge
* commit 'b3e8a615d0fdb18bd4d3ac76e72b3fceab590f17':
  JOP40F
2012-12-12 07:43:43 -08:00
The Android Open Source Project b3e8a615d0 am 16cb8655: Reconcile with jb-mr1-release - do not merge
* commit '16cb8655bd96cf32d192acd787d27504153a96ae':
  JOP40F
2012-12-12 07:42:27 -08:00
The Android Open Source Project 16cb8655bd Reconcile with jb-mr1-release - do not merge
Change-Id: I8c4ba6b279cebcc46d7b7cb71c81f1de96962ca9
2012-12-12 07:38:42 -08:00
The Android Open Source Project 4c52d70152 am c9b99362: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit 'c9b993620b5648dac65804cb6a314aad1d58432d':
  JDP72B
  JDP72
2012-12-12 07:36:23 -08:00
The Android Open Source Project c9b993620b Reconcile with jb-mr1.1-release - do not merge
Change-Id: Idb85365d68dc7637fb2efd3213eacb49c0e26785
2012-12-12 07:33:50 -08:00
The Android Automerger 29132ce84b JDP72B 2012-12-11 23:59:23 -08:00
Ben Cheng 02d29216c9 am b3a68f6e: am 62f1d86e: Merge "Define TARGET_GCC_VERSION in target specific make files."
* commit 'b3a68f6e002cdbc946d08a76656067d63542a98a':
  Define TARGET_GCC_VERSION in target specific make files.
2012-12-11 16:53:05 -08:00
Ben Cheng b3a68f6e00 am 62f1d86e: Merge "Define TARGET_GCC_VERSION in target specific make files."
* commit '62f1d86e4850bdc4f470cf1f0c2428f5b427a347':
  Define TARGET_GCC_VERSION in target specific make files.
2012-12-11 16:51:13 -08:00
Ben Cheng 5011dd80ee Refresh ARM toolchain to GCC 4.7 / binutils 2.22.
Change-Id: Id3689376ae4c4fc183569955b2ee98df5c069510
2012-12-11 16:41:01 -08:00
The Android Automerger 2710dcbac8 JDP72 2012-12-11 15:57:10 -08:00
The Android Automerger bd2e0d776c merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-11 15:56:16 -08:00
Ben Cheng 62f1d86e48 Merge "Define TARGET_GCC_VERSION in target specific make files." 2012-12-11 15:52:02 -08:00
Ben Cheng 054ffd2e7c Define TARGET_GCC_VERSION in target specific make files.
So that GCC refresh can be performed in a target specific way.

Change-Id: I867e8b8fd671bef8c5af300e657a6da4fface032
2012-12-11 14:03:18 -08:00
The Android Automerger acb046abd0 JOP40F 2012-12-11 13:59:16 -08:00
The Android Open Source Project 29e21d40ac am 7c6658ea: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '7c6658ea71f5aa3a3614cd2dbde123b831850e55':
  JDP71B
2012-12-11 11:55:30 -08:00
The Android Open Source Project 7c6658ea71 Reconcile with jb-mr1.1-release - do not merge
Change-Id: Idcf1a5e4acf53a40deeb6304d83a734722c7aff4
2012-12-11 11:53:49 -08:00
Nick Kralevich b3f0eb16b2 am 7cd20491: am a303510f: Merge "x86: enable FORTIFY_SOURCE"
* commit '7cd204914ef59c4ce96210539489ec3e76942bb4':
  x86: enable FORTIFY_SOURCE
2012-12-11 10:35:17 -08:00
Nick Kralevich 7cd204914e am a303510f: Merge "x86: enable FORTIFY_SOURCE"
* commit 'a303510f133e0e20aefedd7d03adfbb88cb85a54':
  x86: enable FORTIFY_SOURCE
2012-12-11 10:33:14 -08:00
Nick Kralevich a303510f13 Merge "x86: enable FORTIFY_SOURCE" 2012-12-11 08:41:36 -08:00
The Android Automerger aa81ebb808 JDP71B 2012-12-10 19:34:09 -08:00
The Android Automerger 77072f9d6f merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-10 19:33:28 -08:00