Commit graph

5155 commits

Author SHA1 Message Date
Yohann Roussel
85cacbe0e0 Fix doc target for multidex support library.
(cherry picked from commit 5679e356d2)

Change-Id: I2e97f59796046d94c9b03dbc89ec1d2153b54ce1
2014-07-25 17:14:35 +02:00
Ying Wang
6aef047362 Support to set up TARGET_COPY_OUT_VENDOR in board config.
We first define TARGET_COPY_OUT_VENDOR as a placeholder. In product
config makefiiles we actually get the placeholders in
PRODUCT_COPY_FILES. A device can set up TARGET_COPY_OUT_VENDOR in its
BoardConfig.mk. We substitute the placeholder with the real
TARGET_COPY_OUT_VENDOR value after loading the BoardConfig.mk.
With this change, we can support building vendor stuff to
system.img (the default) or a separate vendor.img.

Bug: 16515152
Change-Id: I5b601d7a8b34fe032a1bac02aa5c204a3765691d
2014-07-23 22:26:32 -07:00
Dehao Chen
1cd4638594 Merge "Refactor FDO support code to ensure arm64 can also be built with FDO." into lmp-dev 2014-07-23 18:44:51 +00:00
Dehao Chen
25671e15cc Refactor FDO support code to ensure arm64 can also be built with FDO.
Change-Id: I752c9f411b0a046a15c72b4837efc1fb0503b470
2014-07-23 16:23:46 -07:00
Ying Wang
e799869823 Merge "Support to install prebuilt split APKs with LOCAL_PACKAGE_SPLITS" into lmp-dev 2014-07-23 18:56:15 +00:00
Ying Wang
00fe587974 Support to install prebuilt split APKs with LOCAL_PACKAGE_SPLITS
In prebuilt app module, you can use LOCAL_PACKAGE_SPLITS to specify a
list of prebuilt split apks. The build system will sign and zipalign the
apks and install them with the same file names.
Note that you need to put all the source split apks in the same folder.

Bug: 16319961
Change-Id: Id2b6d743c1edc5e436007ec11acece1748adad45
2014-07-23 14:38:02 -07:00
Ying Wang
0d660660db Merge "Improve rules of split apks." into lmp-dev 2014-07-23 18:56:15 +00:00
Ying Wang
7f625aad03 Improve rules of split apks.
- Better messaging if the expected split apk isn't generated by the aapt
  command in the base apk rule; Remove the built base apk, so make will
  rerun aapt after the user changes the splitting parameters.
- Use cleaner static pattern rules instead of running $(foreach) with
  $(eval).

Bug: 16319961
Change-Id: If6ae302e1a39d2e0db8f784d4e1cf292ec855281
2014-07-23 16:38:06 -07:00
Ying Wang
84c26b6949 Delete .swp file added by accident.
Also added .swp to .gitignore.

Change-Id: I51700f55230facde2e46574aa039d45ae5b29cdf
2014-07-22 17:42:35 -07:00
Ying Wang
1425e2d8c0 Support LOCAL_PACKAGE_SPLITS.
Support LOCAL_PACKAGE_SPLITS, which accepts a list of resource lables
and generates multiple apks. The build system sets up rules to sign and
zipalign the split apks.

Bug: 16319961
Change-Id: I344b3d1c7eb158c6d0df879093d666a89870aadd
2014-07-22 17:37:11 -07:00
Yohann Roussel
c324a62425 Put only src in FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS for multidex
This keeps only the real sources in doc target and fixes some error
messages caused by trying to generate docs of the tests.

(cherry picked from commit 100aba5374)

Change-Id: I39f3ede95ae68777ca5e3db4ab5c6ebeefc86ac6
2014-07-23 16:07:20 +02:00
Daniel Rosenberg
337bbf89d9 Merge "Create a vendor build.prop for verifying versions" into lmp-dev 2014-07-22 16:21:19 +00:00
Daniel Rosenberg
40b61ca768 Create a vendor build.prop for verifying versions
The vendor build.prop contains the fingerprint for the build, and
timestamps. It allows you to tell if the vendor partition matches
the system partition.

Change-Id: Icf261571e82823928b2562e66e48fbcb0da55801
Signed-off-by: Daniel Rosenberg <drosen@google.com>
2014-07-22 15:00:59 -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
Sebastien Hertz
3389b9e887 Merge "Vary non-image Xmx for dex2oat on MIPS." into lmp-dev 2014-07-17 19:51:18 +00:00
Ian Rogers
bb6593243f Vary non-image Xmx for dex2oat on MIPS.
The image Xmx is already fixed at 64m. The issue is in the non boot image case.

(cherry picked from commit 87f0d006f2)

Change-Id: Id4a6d9e8edf00505198c3f3dd599cb7b7f06363a
2014-07-22 18:36:25 +02:00
Tsu Chiang Chuang
64a0607262 Merge "Include cts-junit target for cts tests." into lmp-dev 2014-07-22 16:29:55 +00:00
Tsu Chiang Chuang
c73d200ca5 Include cts-junit target for cts tests.
(cherry picked from commit 1949a41e70)

Change-Id: Ic1d05f0eb1ceb1ac732b57ba1322acd17758b8d3
2014-07-21 22:23:18 -07:00
Ying Wang
0ea63e0cbd Merge "Remove framework2" into lmp-dev 2014-07-19 22:40:06 +00:00
Ying Wang
14c975b830 Remove framework2
We don't need fraemwork2 split with the multidex framework.jar.

Change-Id: Ifc595b3679946d8958a9282360c7da9bc18e8adc
2014-07-21 14:42:29 -07:00
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
Sebastien Hertz
2715dc678a Merge "Fix the MIPS build." into lmp-dev 2014-07-17 19:51:18 +00:00
Ian Rogers
16de128da1 Fix the MIPS build.
Use an override for the dex2oat Xmx value when cross-compiling.
Bug: 16221224

(cherry picked from commit 7d70f830bc)

Change-Id: Ic13b471c74325e8145a0a9c93a417355505e484a
2014-07-22 09:46:37 +02:00
Ying Wang
ab4a98a85d Remove unnecessary dependency of the sdk target.
ALL_GENERATED_SOURCES forces to build heavy things already covered by
build cache.

Change-Id: I362bc450b9e303120d12ee8d53d75e86ef71e58f
2014-07-21 16:06:21 -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