Commit graph

5133 commits

Author SHA1 Message Date
Ying Wang
2f7b92c90a The order of SDK version matters.
Because some places assumes the last item is the latest public SDK
version number.

Change-Id: I0ac83ab204dcabec0b9399db1bebc77322808074
2014-07-21 13:44:06 -07:00
Ying Wang
efb935800b Support "LOCAL_SDK_VERSION := system_current"
A module can declare "LOCAL_SDK_VERSION := system_current" to build
against the android system stubs generated from source.
For now this is only supported in platform build.

Change-Id: I1e9bbd159886bc0ea3a02b1dc4cbcb1a56e9cb15
2014-07-19 17:00:50 -07:00
Ying Wang
50367cc77d Trim down BUILD_FINGERPRINT.
Bug: 15593959
Change-Id: I90161045b5d5f2df726a4f69740f0875c8bfc69f

Conflicts:
	core/build_id.mk
2014-07-19 09:37:52 -07:00
Ying Wang
2ce3d5c4ae Update rule of APPS_ZIP to use the new paths of apks.
Bug: 16319961
Change-Id: I9fc93f329a34e404beaf3fa212772b731a7020ff
2014-07-18 19:15:15 -07:00
Ying Wang
af9757e849 New installation path for apks and their JNIs.
Apk's path is changed to <parent_dir>/MyApp/MyApp.apk;
JNI path is changed to <parent_dir>/MyApp/lib/<arch_name>/libfoo.so.
Symlinks of JNIs are changed accordingly.

Bug: 16319961
Change-Id: Ib3b2309c95fa9aea27837fcc29e28d990b04747b
2014-07-18 16:26:24 -07:00
Ying Wang
4221873693 Delete vendor and oem staging directory in "make installclean".
Change-Id: If3211772ea37d4c249c2dc5cc69bd9f48a39b6e3
2014-07-18 09:56:13 -07:00
Ying Wang
3e72ed17a5 Fail build if non-symlink /system/vendor detected while we are building
Fail build if non-symlink /system/vendor detected while we are building
a separate vendor.img.

Bug: 16360411
Change-Id: I96cb6d0b654d6632cd820ba193423e9a16214638
2014-07-17 13:00:20 -07:00
Ying Wang
cff386250f Include vendor.img in PDK build.
- Add the stuff in /vendor to platform.zip.
- Pull things of vendor.img from platform.zip when doing PDK fusion
  build.

Bug: 16354024
Change-Id: I4f3fd392af8c357a5614b3e26ceac15fd3e6a0d0
2014-07-16 17:46:35 -07:00
Joe LaPenna
792ab6cd24 Add tvdpi to list of possible recovery asset densities
Bug: 16306251

Change-Id: Iaf2d36d734bb6b639b01e1097723d8387259265b
2014-07-15 16:51:44 -07:00
Ed Heyl
f6771f631b reconcile aosp (8689b90bcf) after branching. Please do not merge.
Change-Id: I0e4c55cc5a04d4593c3cd200c08c48d18c08a161
2014-07-14 23:32:28 -07:00
Guang Zhu
4f892ab728 DO NOT MERGE: Change build id to LMP
Change-Id: Ic52925bb3f01c5d3f6560f6c9d7a8f4c58500101
2014-07-15 02:45:43 +00:00
Daniel Rosenberg
f4eabc3961 Added support for building verified vendor partition
Change-Id: I762724800ccab3a365e6d2efdf86cd9c394818eb
Signed-off-by: Daniel Rosenberg <drosen@google.com>
2014-07-14 22:55:22 +00:00
Jeff Brown
5d0da1f959 Build docs for android-support-media-protocols.jar.
Change-Id: Ib98b1cf3c4ab04594788f5182e616987a64b55be
2014-07-14 04:08:15 -07:00
The Android Automerger
263bce3e2a "LDW13B" 2014-07-13 13:24:05 -07:00
Geremy Condra
557e9c977f Merge "Add support for signed boot images." 2014-07-10 20:49:26 +00:00
Geremy Condra
740b6636cc Add support for signed boot images. 2014-07-10 14:53:08 -07:00
Geremy Condra
f5ca5c4b0d Merge "Revert "Add support for signed boot images."" 2014-07-10 20:49:26 +00:00
Geremy Condra
ac880493e2 Revert "Add support for signed boot images."
This reverts commit 7e2c5ed84f.

Change-Id: Id90e3b2d986fac3ac9b2748194747af712ac4ab1
2014-07-10 21:29:24 +00:00
Geremy Condra
7e2c5ed84f Add support for signed boot images.
Change-Id: Ib08fc700f626d838efa9a543316afbcd4b782525
2014-07-10 12:23:25 -07:00
Geremy Condra
2987048f81 Merge "Add support for signed boot images." 2014-07-10 17:35:05 +00:00
Colin Cross
fddd992d90 am 5c75fa65: am 50fb938f: am ec5563b5: Merge "build: fix host dex2oat runtime args"
* commit '5c75fa6561b7b58ae8f024bc6936433242cc9b43':
  build: fix host dex2oat runtime args
2014-07-10 11:05:13 +00:00
Colin Cross
5c75fa6561 am 50fb938f: am ec5563b5: Merge "build: fix host dex2oat runtime args"
* commit '50fb938f79387ab92ed3b64194da47b146d74db6':
  build: fix host dex2oat runtime args
2014-07-10 09:43:33 +00:00
Colin Cross
50fb938f79 am ec5563b5: Merge "build: fix host dex2oat runtime args"
* commit 'ec5563b55146372fe33ebd4fc13661d811b77323':
  build: fix host dex2oat runtime args
2014-07-10 06:33:08 +00:00
Ying Wang
cab3ac84c2 am 094ab99f: am bc3b9801: am c4954f39: Merge "Don\'t enable LOCAL_DEX_PREOPT for apks outside system.img"
* commit '094ab99f27e68cfb6a39c2355be377e27bd6df72':
  Don't enable LOCAL_DEX_PREOPT for apks outside system.img
2014-07-10 00:42:53 +00:00
Ying Wang
094ab99f27 am bc3b9801: am c4954f39: Merge "Don\'t enable LOCAL_DEX_PREOPT for apks outside system.img"
* commit 'bc3b98012dc77474d146db7747c7f33c50fe31c0':
  Don't enable LOCAL_DEX_PREOPT for apks outside system.img
2014-07-10 00:16:48 +00:00
Ying Wang
bc3b98012d am c4954f39: Merge "Don\'t enable LOCAL_DEX_PREOPT for apks outside system.img"
* commit 'c4954f392e94f1877ab77ccef725a26c5d549ed1':
  Don't enable LOCAL_DEX_PREOPT for apks outside system.img
2014-07-10 00:08:18 +00:00
Ying Wang
edfd55ae99 Don't enable LOCAL_DEX_PREOPT for apks outside system.img
Bug: 15621103
Change-Id: If267a4aaad17b66d9779169237e06d65d67f088f
2014-07-09 10:57:32 -07:00
Brian Carlstrom
b1c9734b68 am ef0b6e0c: am 8a749606: am 02a5b517: Merge "Make dex2oat heap size product configurable [build]"
* commit 'ef0b6e0c19eb37f4fbc42491771611e247168519':
  Make dex2oat heap size product configurable [build]
2014-07-09 15:07:13 +00:00
Ying Wang
26dbc3e6e4 am d3b5d574: am ce40d5f9: am bc7501e1: Merge "More consistent use of 64-bit build variable."
* commit 'd3b5d574defd565d6e810cbb86e3943837f94065':
  More consistent use of 64-bit build variable.
2014-07-09 15:07:12 +00:00
Colin Cross
dd2ff5541e build: fix host dex2oat runtime args
The dalvik.vm.* properties are in PRODUCT_DEFAULT_PROPERTY_OVERRIDES,
not PRODUCT_PROPERTY_OVERRIDES.
Use $(call func,args) for user defined functions
Prepend the property contents with -Xms or -Xmx when passing to
dex2oat.  This only worked before because DEX2OAT_XMS, etc. were blank
due to the first two  bugs, which resulted in --runtime-arg --runtime-arg
and anything starting with -- as the argument to --runtime-arg is
silently ignored.

Change-Id: Ifa30038b397355171fefcc5248eea033bb634036
2014-07-09 22:22:10 -07:00
Brian Carlstrom
ef0b6e0c19 am 8a749606: am 02a5b517: Merge "Make dex2oat heap size product configurable [build]"
* commit '8a7496060df85c241b976d6cd69b13828e452ef9':
  Make dex2oat heap size product configurable [build]
2014-07-09 12:36:31 +00:00
Ying Wang
d3b5d574de am ce40d5f9: am bc7501e1: Merge "More consistent use of 64-bit build variable."
* commit 'ce40d5f99e9c0658aab9539bf8afa253dfd985e4':
  More consistent use of 64-bit build variable.
2014-07-09 12:36:30 +00:00
Brian Carlstrom
8a7496060d am 02a5b517: Merge "Make dex2oat heap size product configurable [build]"
* commit '02a5b51798b06434b08ffe2f6e6c485e73cd42bc':
  Make dex2oat heap size product configurable [build]
2014-07-09 12:21:56 +00:00
Ying Wang
ce40d5f99e am bc7501e1: Merge "More consistent use of 64-bit build variable."
* commit 'bc7501e10324caf1318769901d8a382d46be0b60':
  More consistent use of 64-bit build variable.
2014-07-09 12:21:48 +00:00
Ying Wang
3abc2a3926 Copy over aidl info for modules not loaded by the current build
That way we don't lose the record if user is running mm/mmm.

Change-Id: I1e1a8b99b4f659b73f73d89f409a24aa36464066
2014-07-08 22:11:06 -07:00
Brian Carlstrom
02a5b51798 Merge "Make dex2oat heap size product configurable [build]" 2014-07-08 22:56:31 +00:00
Ying Wang
4b1c95d8d2 More consistent use of 64-bit build variable.
Set up TARGET_IS_64_BIT and HOST_IS_64_BIT early so we don't need 2
mechanisms to judge if it's 64-bit build;
Remove the unnecessary 32-bit host variables.

Change-Id: I08d6d4d9ea70f91135fe2ee05463fb9a0d1cee42
2014-07-08 18:04:17 -07:00
Dan Albert
8f73aeea87 am 183f90f4: am 3ffcf184: Merge "Remove -Bsymbolic from builds."
* commit '183f90f40ce9e0fafa563dfaf1fb4450cb98168c':
  Remove -Bsymbolic from builds.
2014-07-08 18:55:55 +00:00
Dan Albert
183f90f40c am 3ffcf184: Merge "Remove -Bsymbolic from builds."
* commit '3ffcf184bcb61bad78f3e503ca1760e64e4d30bb':
  Remove -Bsymbolic from builds.
2014-07-08 18:51:44 +00:00
Brian Carlstrom
cffe289dc6 Make dex2oat heap size product configurable [build]
Bug: 15919420
Change-Id: If92318a6e3d5b9c8c6a2d08a3371386fa5ad8f45
2014-07-08 11:33:45 -07:00
Dan Albert
3ffcf184bc Merge "Remove -Bsymbolic from builds." 2014-07-08 18:09:01 +00:00
Dan Albert
9d8d20a1e1 am 8f73aeea: am 183f90f4: am 3ffcf184: Merge "Remove -Bsymbolic from builds."
* commit '8f73aeea87f96d715ca2f39a35fd73986feecceb':
  Remove -Bsymbolic from builds.
2014-07-08 18:59:48 +00:00
Ying Wang
55ec7e63d0 am 9e00b638: am cd02c025: am 979d578e: Merge "Fix host java doc by referring to the correct classpath."
* commit '9e00b6385c5805743f5beaa22dffce021342ed5e':
  Fix host java doc by referring to the correct classpath.
2014-07-08 01:38:44 +00:00
Ying Wang
9e00b6385c am cd02c025: am 979d578e: Merge "Fix host java doc by referring to the correct classpath."
* commit 'cd02c025ad6b0647d612c4b939df8e5de55f5192':
  Fix host java doc by referring to the correct classpath.
2014-07-08 00:48:55 +00:00
Ying Wang
cd02c025ad am 979d578e: Merge "Fix host java doc by referring to the correct classpath."
* commit '979d578ee40c0a7d3e25915049350a23165f7a5a':
  Fix host java doc by referring to the correct classpath.
2014-07-08 00:43:42 +00:00
Ying Wang
f951b7743f am 1c00c702: am 45322890: am d2aa51b8: Merge "Clean the last bit of LOCAL_BUILD_HOST_DEX."
* commit '1c00c7026c23967ca33524356dc11d9885f960f9':
  Clean the last bit of LOCAL_BUILD_HOST_DEX.
2014-07-08 00:31:00 +00:00
Ying Wang
1c00c7026c am 45322890: am d2aa51b8: Merge "Clean the last bit of LOCAL_BUILD_HOST_DEX."
* commit '45322890266c1d704b130fabd7ee5bab5db35997':
  Clean the last bit of LOCAL_BUILD_HOST_DEX.
2014-07-08 00:26:10 +00:00
Ying Wang
4532289026 am d2aa51b8: Merge "Clean the last bit of LOCAL_BUILD_HOST_DEX."
* commit 'd2aa51b8aee454baf96d8ac6d1997dd9450ae974':
  Clean the last bit of LOCAL_BUILD_HOST_DEX.
2014-07-08 00:22:13 +00:00
Ying Wang
1a5ada11d5 Auto-clean obsolete aidl-generated Java files.
The build system compares aidl files of every module to the previous
build and deletes the intermediate generated source dir if an aidl file
has gone.

Change-Id: I55fcfe1baaae3496613e12c20bca564d408bba58
2014-07-07 16:58:39 -07:00
Brian Carlstrom
ba3c00765c am 3be473bd: am 97609d7f: am 7b53bca0: Merge "Strip all multidex files, not just classes.dex"
* commit '3be473bdb5297094bb48a10b8b388e1071ed999e':
  Strip all multidex files, not just classes.dex
2014-07-02 23:13:32 +00:00