p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
11,435 Commits 1 Branch 0 Tags 68 MiB
Commit Graph

2829 Commits

Author SHA1 Message Date
Stephen Hines f692513071 Clean up libRSSupport.so and libclcore.bc dependencies. 
Bug: 7419958
Change-Id: I62453bb6830cc2c82ca9dbbf576b52da95eef4b1
 2012-12-17 17:59:47 -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
Stephen Hines 7d6ec71965 Add -nostdlib to RS bc->so linker command line. 
Change-Id: Ic715060c3d037ec9fecb0ad9b2be6c2e7052ce0a
 2012-12-13 19:24:50 -08:00
Ben Cheng 9c68f06a54 Merge commit 'ec4caba7' into manualmerge 
Conflicts:
	CleanSpec.mk

Change-Id: Idd8f8f4a896b47bd6275daeb71a24a317da4c98a
 2012-12-13 11:03:58 -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
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 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 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
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 40febcad47 x86: enable FORTIFY_SOURCE 
Enable FORTIFY_SOURCE for Android x86.  This adds certain security
protections to Android programs, checking for common programming
mistakes and buffer overflows.

FORTIFY_SOURCE protections have been enabled for ARM since
a46c480e43 (Jun 4th 2012)

Change-Id: Idae6f93d37ddae605088867cd3029f12632456e1
 2012-12-07 17:20:28 -08:00
Ying Wang 19cc22bc9c Move numeric api files from frameworks/base to prebuilts/sdk 
So they can be used in unbundled builds.

Bug: 7296240
Change-Id: I5f176322dec30323f365188fb3e379def60dc1b8
 2012-12-04 15:07:34 -08:00
Ying Wang ae5979bd24 Merge "Support LOCAL_EXPORT_C_INCLUDE_DIRS for prebuilts too" 2012-12-03 18:33:54 -08:00
Ying Wang fe3f62d06b Support LOCAL_EXPORT_C_INCLUDE_DIRS for prebuilts too 
Change-Id: I09e8e849f642792e3a74e2564820ab9bbf1eb28c
 2012-12-03 18:24:55 -08:00
Ying Wang 36d46e6e12 am d3a561da: am f8b804f8: Merge "Autoadd core-hostdex if LOCAL_BUILD_HOST_DEX is true" 
* commit 'd3a561da10406b482107a052c9c60cf1be80e930':
  Autoadd core-hostdex if LOCAL_BUILD_HOST_DEX is true
 2012-12-03 16:09:35 -08:00
Ying Wang d3a561da10 am f8b804f8: Merge "Autoadd core-hostdex if LOCAL_BUILD_HOST_DEX is true" 
* commit 'f8b804f8c532c6d913d8389f9a8e4c05a8f0310c':
  Autoadd core-hostdex if LOCAL_BUILD_HOST_DEX is true
 2012-12-03 16:07:25 -08:00
Ying Wang 96aa714534 Autoadd core-hostdex if LOCAL_BUILD_HOST_DEX is true 
Change-Id: Id516716eaa90534f1b51133d5fb97468e52802dd
 2012-12-03 15:49:13 -08:00
Jean-Baptiste Queru fb28a3a4e5 resolved conflicts for merge of 0f4e3718 to master 
Change-Id: Ib3615c79fdd9839208c2b14bd58d1d08e4ac49b8
 2012-12-03 15:05:25 -08:00
Jean-Baptiste Queru 0f4e3718df Merge d2e4c25e 
Change-Id: I7d92c594498f6b4c8277d3a54d54b9724da04408
 2012-12-03 14:46:37 -08:00
Dianne Hackborn d2e4c25e3f am b7157909: Merge "Obviously JB MR1.1 should be Android 4.2.2." into jb-mr1.1-dev 
* commit 'b7157909185968064db922bff6d7b1baabe305f4':
  Obviously JB MR1.1 should be Android 4.2.2.
 2012-12-03 14:26:03 -08:00
Dianne Hackborn aa48e74b60 Obviously JB MR1.1 should be Android 4.2.2. 
Change-Id: I148817d22d50672a7f204809d11aaf7f0a8af28b
 2012-12-03 11:07:37 -08:00
Ying Wang 69e9b4d6d1 Run e2fsck on built sparse images. 
Bug: 7591683
Change-Id: Id1cba79f7840aab1f0327cb741eda655b45d1b46
 2012-11-27 09:57:17 -08:00
The Android Open Source Project a2314e433e Merge jb-mr1-dev into aosp/master - do not merge 
Change-Id: Icf16741de4c0d248e5ffe3ef3b31ce6ce51c4c9f
 2012-11-27 08:06:10 -08:00
Ying Wang be09a520c5 am 71958cca: Merge "Establish explicit dependency on selinux file_contexts." 
* commit '71958cca5d5d5b569a2bb2ad2a4baf53045334e9':
  Establish explicit dependency on selinux file_contexts.
 2012-11-21 12:22:23 -08:00
Ying Wang 9362c7ffdd Establish explicit dependency on selinux file_contexts. 
Before this change, because the file_contexts is not in the system,
data or cache directory, the dependency is not reliable.
This fixed the gms build error:
out/target/product/gms/root/file_contexts: No such file or directory

Change-Id: Id8d5b3f4557d43a509ccc00b21dd426a414b7c42
 2012-11-21 11:09:45 -08:00
Ying Wang fdbd9cbe2e Establish explicit dependency on selinux file_contexts. 
Before this change, because the file_contexts is not in the system,
data or cache directory, the dependency is not reliable.
This fixed the gms build error:
out/target/product/gms/root/file_contexts: No such file or directory

Change-Id: Id8d5b3f4557d43a509ccc00b21dd426a414b7c42
 2012-11-21 10:47:00 -08:00
Jean-Baptiste Queru 136383549f Merge f7306051c1 
Change-Id: I6a431153832ea069aba269d09ec73b784844ff44
 2012-11-19 15:08:59 -08:00
Ed Heyl f7306051c1 am 0ddeb0cc: am efcc8b1c: bump version to 4.2.1 
* commit '0ddeb0ccc1d6dbbb21f9c6d7262d629c3cb8a792':
  bump version to 4.2.1
 2012-11-19 14:29:37 -08:00
Ed Heyl 0ddeb0ccc1 am efcc8b1c: bump version to 4.2.1 
* commit 'efcc8b1c79011a6d8ea13774da84c8892cb27e27':
  bump version to 4.2.1
 2012-11-19 14:26:49 -08:00
Ed Heyl efcc8b1c79 bump version to 4.2.1 
Change-Id: If8206ec632b4e912433eebdfa4aed8dde8f37cb4
 2012-11-19 14:20:48 -08:00
Jean-Baptiste Queru 9d9def1b18 resolved conflicts for merge of 4749c6e3 to jb-mr1-dev-plus-aosp - do not merge 
Change-Id: I51fcb88d6b9f188a9c596031a2506eedc7150173
 2012-11-19 10:57:48 -08:00
Chirayu Desai 6d492971dd build_id: change to OPENMASTER 
Change-Id: I87863d8064515a0fabadacf4ca692c775fc4aae0
 2012-11-18 14:09:34 +05:30
Ben Cheng 2a43d74fb4 am bf031a25: am 17c679d0: Merge "[ARM] Extend the usage of TARGET_GCC_VERSION for gdb and arm-eabi-*." 
* commit 'bf031a2586daccf2a47a66c7cc80ac050ba1c16a':
  [ARM] Extend the usage of TARGET_GCC_VERSION for gdb and arm-eabi-*.
 2012-11-16 16:25:51 -08:00
Ben Cheng bf031a2586 am 17c679d0: Merge "[ARM] Extend the usage of TARGET_GCC_VERSION for gdb and arm-eabi-*." 
* commit '17c679d07380b0a4045045fd5d8e56111edf3fbd':
  [ARM] Extend the usage of TARGET_GCC_VERSION for gdb and arm-eabi-*.
 2012-11-16 16:23:02 -08:00
Ben Cheng 8bc4c438bd [ARM] Extend the usage of TARGET_GCC_VERSION for gdb and arm-eabi-*. 
In the future to upgrade the gcc version we just need to edit one
line in core/config.mk.

Change-Id: I01bb38c38f2388913bb7369aa4b2da480411dfbe
 2012-11-16 13:29:13 -08:00
Ying Wang 90304a74a3 am ae56a570: am e1f94189: am ce811261: Merge "Move check-api to definition.mk" into jb-mr1.1-dev 
* commit 'ae56a570cb7e16a0853433d20691b0ee72da5cc2':
  Move check-api to definition.mk
 2012-11-16 10:42:41 -08:00
Guang Zhu fdf573e4e0 am 06b57cef: am f0d4d8f3: DO NOT MERGE: change build id to JB MR1.1 
* commit '06b57cefeaadd0e2f02a5c8a8679884366f4345e':
  DO NOT MERGE: change build id to JB MR1.1
 2012-11-15 18:00:23 -08:00
Guang Zhu 06b57cefea am f0d4d8f3: DO NOT MERGE: change build id to JB MR1.1 
* commit 'f0d4d8f32934df6dc859e2b668d436d67b388cd2':
  DO NOT MERGE: change build id to JB MR1.1
 2012-11-15 17:57:58 -08:00
Guang Zhu f0d4d8f329 DO NOT MERGE: change build id to JB MR1.1 
Among other things, this helps monitoring of automated tests, to
properly show which branch the device is running on

Change-Id: I8bb8e3ec347849da44d29ce502b09a593d61ae0e
 2012-11-15 17:47:53 -08:00
Ying Wang ae56a570cb am e1f94189: am ce811261: Merge "Move check-api to definition.mk" into jb-mr1.1-dev 
* commit 'e1f94189d95084a72d206d89ecb9d38de0512fc6':
  Move check-api to definition.mk
 2012-11-15 15:23:44 -08:00
Ying Wang e1f94189d9 am ce811261: Merge "Move check-api to definition.mk" into jb-mr1.1-dev 
* commit 'ce811261bc8d56d43e59b1f9fb96ae53192de126':
  Move check-api to definition.mk
 2012-11-15 15:20:58 -08:00
Ying Wang c065da2307 Move check-api to definition.mk 
1) Move check-api to definition.mk, so it can be used in other places.
2) Add additional dependency to the api-stub module to consolidate the
apicheck dependency. Previously you have to run 2 "make"s in a row and
only in the 2nd run apicheck is run, due to a gnu-make optimization.

Bug: 7540265
Change-Id: Ib24ed87d9330027a9f95ed7b16dd4002cc0e3198
 2012-11-14 16:00:45 -08:00
Ying Wang 31df068b38 Additional certificates support for an apk. 
Change-Id: I5b35d5728ba9d65f7ece956127270a9ca2ea0efe
 2012-11-13 10:56:04 -08:00
Ying Wang 3482e9256b am eb98e088: am 865d851a: Merge "Remove the obsolete comments and change the misleading var name." 
* commit 'eb98e088937c4568f75d965dee1ef8d5c6689213':
  Remove the obsolete comments and change the misleading var name.
 2012-11-12 14:50:44 -08:00
Ying Wang eb98e08893 am 865d851a: Merge "Remove the obsolete comments and change the misleading var name." 
* commit '865d851a8012e13c35d573d98770b7187d32b7f7':
  Remove the obsolete comments and change the misleading var name.
 2012-11-12 14:45:59 -08:00
Ying Wang 85e8cda340 Remove the obsolete comments and change the misleading var name. 
Change-Id: Ib19099cbce0133f5c7df44fa0fd80215809a1ad8
 2012-11-12 14:31:20 -08:00