tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
19351 commits 1 branch 0 tags 119 MiB
Commit graph

5265 commits

Author SHA1 Message Date
Doug Zongker
3c84f56948 store images in target-files 
Store sparse images in the target-files, and use those (when they're
available) for building block OTAs.

- New script add_img_to_target_files is added to make the images and
  add them to the IMAGES/ subdir in the target-files.  It gets run
  from the Makefile when building a target-files.

- img_from_target_files becomes mostly vestigial: it creates the
  img.zip by just copying the images out of the target-files.  (It
  still knows how to build images for use on older target-files.)

- ota_from_target_files uses images from the target-files in
  preference to rebuilding images from the source files.

- sign_apk_target_files builds images and includes them in its output
  target files (even if the input target-files didn't have them).

Bug: 16488065
Change-Id: I444e0d722d636978209467ffc01750a585c6db75
 2014-07-31 11:06:30 -07:00
Ying Wang
4dfb5580c2 Merge "Don't apply PRODUCT_AAPT_PREF_CONFIG if LOCAL_PACKAGE_SPLITS is set" into lmp-dev 2014-07-30 20:38:44 +00:00
Ying Wang
934008f9d5 Don't apply PRODUCT_AAPT_PREF_CONFIG if LOCAL_PACKAGE_SPLITS is set 
Bug: 16319961
Change-Id: I8ea308c94ff58eaccd8854ab98e11238b993f867
 2014-07-30 13:40:14 -07:00
Ying Wang
b169fb7822 Revert "Revert "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to clang."" 
This reverts commit a4f84fdfed.
Added "export CCACHE_CPP2 := true" to work around ccache bug with clang.
See:
http://petereisentraut.blogspot.com/2011/09/ccache-and-clang-part-2.html

Change-Id: I2b1fa8fd59c3a113c4028a92a1d16018133c9792
 2014-07-30 10:14:37 -07:00
Dehao Chen
e43c96c332 Merge "Update the FDO support:" into lmp-dev 2014-07-29 21:36:00 +00:00
Dehao Chen
5f5c48f0f1 Update the FDO support: 
* Explicitly check BUILD_FDO_INSTRUMENT and BUILD_FDO_OPTIMIZE with true
* Remove unnecessary target_libgcov
* Update the profile collection path on device so that most app can have write access

Change-Id: I5c1915a12ea37b2cb3c76a27e7104e47ad636928
 2014-07-30 16:54:55 -07:00
Yohann Roussel
355520e35e Merge "Fix doc target for multidex support library." into lmp-dev 2014-07-24 15:36:05 +00:00
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
Stephen Hines
e9bf1bdac6 Merge "Default to "prescott" as our baseline i686 host build architecture." into lmp-dev 2014-07-24 22:43:15 +00:00
Przemyslaw Szczepaniak
ac6a9195ca Switch NDK arm64 libraries to 4.9. 
Change-Id: Iffc30e34b798896d9259ca1dfc3ff2d21683d6a4
(cherry picked from commit 5895dd13a7)
 2014-07-25 13:44:34 +00:00
Stephen Hines
76bd60b7da Default to "prescott" as our baseline i686 host build architecture. 
Bug: 16408818

Change-Id: I41760605bf9f4589859afd20cc96ccbedb6fe82c
 2014-07-25 00:42:14 -07: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
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
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
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
Ying Wang
f50459c6e5 am 51f01f64: am bf0a9c4a: am cc80f5a1: Merge "Fix partition_tag usage in install_jni_libs" 
* commit '51f01f643f361d0918c181c9fc549f98f873dce9':
  Fix partition_tag usage in install_jni_libs
 2014-07-02 23:13:29 +00:00
Ying Wang
e68ec71903 [DO NOT MERGE] Workaround to fix klp-modular-dev-plus-aosp build. 
Change-Id: I8042b045f20b870de84ea7c4c060c3cbe1cdfe69
 2014-07-02 14:26:49 -07:00
Ying Wang
979d578ee4 Merge "Fix host java doc by referring to the correct classpath." 2014-07-02 20:59:15 +00:00
Ying Wang
ad7809bba4 Fix host java doc by referring to the correct classpath. 
In droiddoc for host, we don't generate classes.jar for
LOCAL_JAVA_LIBRARIES. Switch to refer to the installed jar file instead.
This is consistent with how LOCAL_JAVA_LIBRARIES for host is handled in
base_rules.mk.

Bug: 9176318
Change-Id: If7460b30ca5da28743487d66da0029a44108d556
 2014-07-07 16:50:39 -07:00
Ying Wang
f25318a5f9 Clean the last bit of LOCAL_BUILD_HOST_DEX. 
Long live LOCAL_BUILD_HOST_DEX!

Change-Id: I8de23cfc78edc554606a2e1a8a955e8bc3ad02b0
 2014-07-07 17:15:38 -07:00
Brian Carlstrom
3be473bdb5 am 97609d7f: am 7b53bca0: Merge "Strip all multidex files, not just classes.dex" 
* commit '97609d7f0b0a9d944e1de8b85c150d2e1772c8cb':
  Strip all multidex files, not just classes.dex
 2014-07-02 16:44:19 +00:00
Brian Carlstrom
97609d7f0b am 7b53bca0: Merge "Strip all multidex files, not just classes.dex" 
* commit '7b53bca0b925bc9f47b51afba14c3c8f064eae81':
  Strip all multidex files, not just classes.dex
 2014-07-02 16:39:23 +00:00
Ying Wang
51f01f643f am bf0a9c4a: am cc80f5a1: Merge "Fix partition_tag usage in install_jni_libs" 
* commit 'bf0a9c4ac842f340f4d995205999ed472b124f17':
  Fix partition_tag usage in install_jni_libs
 2014-07-02 16:20:40 +00:00
Ying Wang
bf0a9c4ac8 am cc80f5a1: Merge "Fix partition_tag usage in install_jni_libs" 
* commit 'cc80f5a1ff4a8b751e36b7d1d5a3670f6ec12ba0':
  Fix partition_tag usage in install_jni_libs
 2014-07-02 16:15:35 +00:00
Dan Willemsen
731322a90d Fix partition_tag usage in install_jni_libs 
This was expanding to TARGET_VENDOR_OUT_SHARED_LIBRARIES which was
empty. It should be expanding to TARGET_OUT_VENDOR_SHARED_LIBRARIES.

Change-Id: I32fe22e3e0b91a6d41f6a09a33d3ce2e4061d078
 2014-07-01 18:56:31 -07:00
Brian Carlstrom
7b53bca0b9 Merge "Strip all multidex files, not just classes.dex" 2014-07-01 23:33:34 +00:00
Brian Carlstrom
fca814550c Strip all multidex files, not just classes.dex 
Bug: 10447095
Change-Id: I6053ca97cb0e28621262a385d57c0996e7c1aaab
 2014-07-01 23:04:36 -07:00
Santos Cordon
7d36e1574f Add phone directory to frameworks/base. 
Necessary to support the change: Id8b08d88a06a7b4e90a4a7f702ba56526e108ca5

Change-Id: I1a00d2cdcb26fa796c5d0840cfe16b0e416ad299
 2014-07-02 18:05:25 +00:00
Ying Wang
e050245b7a am 0d0b7b36: am 2530c787: am 4b539d15: Merge "More consistent host library path in multilib build." 
* commit '0d0b7b3669d3cb309ddd26cf23ddddbe4d42fd8e':
  More consistent host library path in multilib build.
 2014-07-01 00:35:21 +00:00
Ying Wang
0d0b7b3669 am 2530c787: am 4b539d15: Merge "More consistent host library path in multilib build." 
* commit '2530c787db272bfb4afab80e37323b9b7d00671c':
  More consistent host library path in multilib build.
 2014-07-01 00:28:14 +00:00
Ying Wang
2530c787db am 4b539d15: Merge "More consistent host library path in multilib build." 
* commit '4b539d1533a5d8647e5f54b0a41b2a49d7f4c785':
  More consistent host library path in multilib build.
 2014-07-01 00:22:30 +00:00
Elliott Hughes
0635498086 am 3a2f6ecf: am 491871aa: am 4b7ba417: Merge "Add -Wl,--fatal-warnings to x86_64." 
* commit '3a2f6ecf3f7af6819b601645334d4c563401d37a':
  Add -Wl,--fatal-warnings to x86_64.
 2014-06-30 23:04:35 +00:00
Elliott Hughes
3a2f6ecf3f am 491871aa: am 4b7ba417: Merge "Add -Wl,--fatal-warnings to x86_64." 
* commit '491871aa03b6a6b4d4f1d6ebb7e2f4dc746b4d4b':
  Add -Wl,--fatal-warnings to x86_64.
 2014-06-30 22:59:37 +00:00
Elliott Hughes
491871aa03 am 4b7ba417: Merge "Add -Wl,--fatal-warnings to x86_64." 
* commit '4b7ba41704a8f028ffdf9f2c8bff57d9d4055f93':
  Add -Wl,--fatal-warnings to x86_64.
 2014-06-30 22:53:49 +00:00
Ying Wang
4b539d1533 Merge "More consistent host library path in multilib build." 2014-06-30 22:29:38 +00:00
Ying Wang
36ef50f2a2 More consistent host library path in multilib build. 
In 64-bit multilib host build, changed from
32-bit lib: out/host/<platform>/lib32
64-bit lib: out/host/<platform>/lib
to
32-bit lib: out/host/<platform>/lib
64-bit lib: out/host/<platform>/lib64
.
That way the host library path is consistent with the multilib target
build's. Also with this change prebuilt 32-bit libraries can be reused
in 64-bit host build as 2nd arch binaries. (With previous setup, they
can't be used because they have rpath ../lib in it while the 2nd arch
library path needs ../lib32.

Change-Id: I020199d0c7dd52cdc8dcb7d3a1d22cd6178672e1
 2014-06-30 17:06:21 -07:00
Ying Wang
9327f77a01 am ccbf5930: am 51254e6c: Merge "Fix missing rs_compatibility_jni_libs." 
* commit 'ccbf59304645dde557e24e7a8dd1440111d1a3ce':
  Fix missing rs_compatibility_jni_libs.
 2014-06-30 18:30:46 +00:00
Ying Wang
ccbf593046 am 51254e6c: Merge "Fix missing rs_compatibility_jni_libs." 
* commit '51254e6c6065c0c771886472853e6dbc5377c6ae':
  Fix missing rs_compatibility_jni_libs.
 2014-06-30 18:25:37 +00:00
Ying Wang
a626d3b44b Fix missing rs_compatibility_jni_libs. 
Bug: 15935150
Change-Id: I2971bcf4a9fa96e7a5098a759ecc67ba4f565b6c
 2014-06-30 11:17:16 -07:00
Brian Carlstrom
191e5988d0 resolved conflicts for merge of da92aef7 to master 
Change-Id: I70b608d48b0e7cfea3d970101769c156a211f861
 2014-06-28 13:54:24 -07:00
Ian Rogers
da92aef762 am 8625b6e7: am 7634e413: Merge "Host support for prefer symlink" 
* commit '8625b6e74ae33db8ce7d18c131ba3d87f121d1f3':
  Host support for prefer symlink
 2014-06-28 00:36:10 +00:00
Ian Rogers
8625b6e74a am 7634e413: Merge "Host support for prefer symlink" 
* commit '7634e4136fee6c7a02f4a343072400ba575c0051':
  Host support for prefer symlink
 2014-06-28 00:30:43 +00:00
Ying Wang
efe7779cfb Fix missing rs_compatibility_jni_libs. 
Bug: 15935150
Change-Id: I2971bcf4a9fa96e7a5098a759ecc67ba4f565b6c
 2014-06-30 11:20:41 -07:00
Ian Rogers
cf331d931d Host support for prefer symlink 
We need a host symlink for dalvik, our *-dalvik-host build targets
are failing.

Change-Id: I6045de20c948b456a150033deb3459895aff83c6
 2014-06-27 17:23:03 -07:00
Ying Wang
7a6a9a5582 am 4bdbd6d4: am e1b43254: Merge "Add --pseudo-localize aapt parameter for builds." 
* commit '4bdbd6d4346a246df8edaf9323e15d84a1f35951':
  Add --pseudo-localize aapt parameter for builds.
 2014-06-27 16:19:26 +00:00
Ying Wang
4bdbd6d434 am e1b43254: Merge "Add --pseudo-localize aapt parameter for builds." 
* commit 'e1b43254b72613e6bf9ac994c1b3f07e0020ed9c':
  Add --pseudo-localize aapt parameter for builds.
 2014-06-27 16:14:30 +00:00
Ying Wang
8d43e17bfd Merge "Support to check System API." 2014-06-27 15:56:14 +00:00
Ying Wang
829f68bb02 Support to check System API. 
Change-Id: I60f8c9bb13efb6a440bb735d634f63fab035c810
 2014-06-26 17:54:28 -07:00
Colin Cross
e2543ea2ea Merge "build: fix vendor symbols in gdb" 2014-06-26 18:42:03 +00:00
Colin Cross
d00c0a2e20 HACK: report CPU abi as 2nd arch if present 
Workaround to report armv7 abis for arm64 devices until the play store
looks at the new android.os.Build.SUPPORTED_ABIS list.

Bug: 15018047
Change-Id: If5f4081073ee80433aae51ef15ccbfa1c6ae624c
 2014-06-27 10:49:26 -07:00
Colin Cross
a58f8e04c9 build: fix vendor symbols in gdb 
Set TARGET_OUT_VENDOR_SHARED_LIBRARIES_UNSTRIPPED
Append '64' for 64-bit libraries

Change-Id: Ief289bb23950d4bed84cf616cff6038fbd8caf95
 2014-06-27 10:48:22 -07:00
Ying Wang
a26a2123b8 am 7a6a9a55: am 4bdbd6d4: am e1b43254: Merge "Add --pseudo-localize aapt parameter for builds." 
* commit '7a6a9a558271ac959a2e441fe27aae3df77d4421':
  Add --pseudo-localize aapt parameter for builds.
 2014-06-27 16:24:46 +00:00
Elliott Hughes
4b7ba41704 Merge "Add -Wl,--fatal-warnings to x86_64." 2014-06-26 18:33:52 +00:00
Elliott Hughes
3beb51692e Add -Wl,--fatal-warnings to x86_64. 
Bug: 11358761
Change-Id: I0c86a2ce3f95e89cc6c6eed65f3595922a90f45f
 2014-06-30 14:52:30 -07:00
Igor Viarheichyk
c4dfe6ef30 Add --pseudo-localize aapt parameter for builds. 
Some packages can override list of locales with
LOCAL_AAPT_INCLUDE_ALL_RESOURCES parameter, disabling
pseudolocalization. Adding new --pseudo-localize flag to
aapt if pseudo-locales are specified in product locales
list solves this issue.

Change-Id: Iae705d4fe99453650339fd1ca65d1005671b3e4f
 2014-06-26 17:27:36 -07:00
Ying Wang
f15250ed86 Set up oem.img directory structure for TARGET_2ND_ARCH. 
Change-Id: Ia931a10708225c428b658cb4a30e8bba66fa7308
 2014-06-26 14:12:35 -07:00
Ying Wang
0e2b634408 am 01b179bf: am bb964f00: am 432cd6dd: Merge "Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build" 
* commit '01b179bf3b5c4c0307e0efb4004a1c44705fe780':
  Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build
 2014-06-25 23:21:30 +00:00
Ying Wang
01b179bf3b am bb964f00: am 432cd6dd: Merge "Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build" 
* commit 'bb964f00403a23d2f1ec3313f7b579a9e7f0f12a':
  Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build
 2014-06-25 23:03:02 +00:00
Ying Wang
bb964f0040 am 432cd6dd: Merge "Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build" 
* commit '432cd6dd78afe9c23cd0ddf669e4f0f973a17a7c':
  Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build
 2014-06-25 22:58:11 +00:00
Ying Wang
904446ce0b am 1a3d260f: am e69d4350: Merge "Support to add JNI of both archs in multilib build." 
* commit '1a3d260f68755b476aa867477fc75d47ef5317bf':
  Support to add JNI of both archs in multilib build.
 2014-06-25 18:46:34 +00:00
Ying Wang
1a3d260f68 am e69d4350: Merge "Support to add JNI of both archs in multilib build." 
* commit 'e69d4350cd4af04349b703ba169ba516a96913ba':
  Support to add JNI of both archs in multilib build.
 2014-06-25 18:37:53 +00:00
Ying Wang
6129192ed6 Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build 
Bug: 15850610
Change-Id: I46b98adb556d8e6bf166761f8bb240006dbe5b14
 2014-06-25 14:25:14 -07:00
Ying Wang
58f8cf7273 am 904446ce: am 1a3d260f: am e69d4350: Merge "Support to add JNI of both archs in multilib build." 
* commit '904446ce0b3f430ac88ae0c08b9c613721474cd5':
  Support to add JNI of both archs in multilib build.
 2014-06-25 18:52:02 +00:00
Ying Wang
8e20ef6205 Support to add JNI of both archs in multilib build. 
Use "LOCAL_MULTILIB := both" to install jni libraries of both archs in
multilib build.
The build system will package jni of both archs to the apk, or install
them to the right location on the system image and create symlinks,
extract .so files from prebuilt apk, etc if appropriate.

Bug: 15849902
Change-Id: I7e147b5a47db476584c38250de7b36c75ea40d81
 2014-06-25 09:07:01 -07:00
smain@google.com
263d6660c8 am 04edc344: Merge "DO NOT MERGE remove leanback and recyclerview from javadoc build for d.android.com" into klp-modular-dev 
* commit '04edc344a1887465692b49e3eb58e03dccedd675':
  DO NOT MERGE remove leanback and recyclerview from javadoc build for d.android.com
 2014-06-25 00:42:51 +00:00
bryant_liu
5f98ff80d4 build: core: Add nxpsw for AEC function 
Change-Id: I27d9bf891e5c67aef843489c2136a586ad921cb2
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
 2014-06-24 13:11:49 -07:00
Ying Wang
1a9e1b43e9 am daaec135: am 5899ad25: am b00bb2d8: Merge "Resolve :32 to 32-bit variant only if the variant exists." 
* commit 'daaec135b4d141335fc1f4e3edf9eb526c9f6954':
  Resolve :32 to 32-bit variant only if the variant exists.
 2014-06-24 19:42:46 +00:00
Ying Wang
daaec135b4 am 5899ad25: am b00bb2d8: Merge "Resolve :32 to 32-bit variant only if the variant exists." 
* commit '5899ad254d3b94653b88e5f0f41f54690f22bd24':
  Resolve :32 to 32-bit variant only if the variant exists.
 2014-06-24 19:35:31 +00:00
Ying Wang
5899ad254d am b00bb2d8: Merge "Resolve :32 to 32-bit variant only if the variant exists." 
* commit 'b00bb2d865c21a446d94422346e1bb0fdbc9ba29':
  Resolve :32 to 32-bit variant only if the variant exists.
 2014-06-24 18:17:52 +00:00
Ying Wang
111ccebf30 am 995783d4: am 57befc90: am eb12847b: Merge "Switch another reference from core to core-libart" 
* commit '995783d4fde29634e9c61379db5fedad0a232089':
  Switch another reference from core to core-libart
 2014-06-24 10:38:49 +00:00
Ying Wang
995783d4fd am 57befc90: am eb12847b: Merge "Switch another reference from core to core-libart" 
* commit '57befc90e924704a7c03bde9596483d0cf1bf36b':
  Switch another reference from core to core-libart
 2014-06-24 09:28:31 +00:00
Ying Wang
57befc90e9 am eb12847b: Merge "Switch another reference from core to core-libart" 
* commit 'eb12847b332831e31a3cf7e2f89bd10fd626d7d5':
  Switch another reference from core to core-libart
 2014-06-24 06:53:20 +00:00
Brian Carlstrom
074151bdf3 Switch another reference from core to core-libart 
Bug: 14298175
Change-Id: I37dc7d5bc63d967db4b3cb8aee695a40b12a8c8d
 2014-06-23 15:34:17 -07:00
Ying Wang
7e73eb3f7c Resolve :32 to 32-bit variant only if the variant exists. 
Otherwise we just use the original module name.
With this change :32 in 32-bit product configuration will be installed
as expected.

Change-Id: Ibbbf3e8807a17b47f4259c00000a63336bc02f92
 2014-06-24 10:22:17 -07:00
smain@google.com
6f97b12c78 DO NOT MERGE 
remove leanback and recyclerview from javadoc build for d.android.com

Change-Id: I0faa1db29dcadda9bfa96bcf4096e369f0a7a4e0
 2014-06-24 17:36:31 -07:00
Bill Yi
85fe14395b Merge "Restore AOSP-style version numbers - DO NOT MERGE" 2014-06-20 02:09:57 +00:00
Ying Wang
eb76adb55f Move sdk staging dir to a product-specific dir. DO NOT MERGE. 
So we can do incremental build across different SDK products.

(cherry picked from commit d7af176199)

Change-Id: I7fc1489c00511b6689d738ee12f0347618c03aa3
 2014-06-20 08:59:33 -07:00
Tsu Chiang Chuang
bcf11b0b0f add jdwp tests to CTS. 
Bug: 8538755

Change-Id: Ie55c0f35ff956726a4f08734c2ad4dc03862dac7
 2014-06-20 12:41:48 -07:00
Ying Wang
b574564f2e Reinforce the dependency on package-export.apk. 
This fixes the bug that if an app has no resource at all, we should
still set up the dependency on package-export.apk, because the
AndroidManifest.xml may still reference symbols in package-export.apk.

Change-Id: Idb3f12abf55c04824da5b666fe7c49694e227e2c
 2014-06-19 16:07:30 -07:00
Neil Fuller
cc317c40d3 am 40f33005: am fa63e306: Merge "Fix the CTS build now that core is gone" 
* commit '40f3300577d4b55926728744f1d25c08aa4e4a8b':
  Fix the CTS build now that core is gone
 2014-06-19 10:39:23 +00:00
Bill Yi
b76d4093d3 Restore AOSP-style version numbers - DO NOT MERGE 2014-06-19 00:22:38 -07:00
Brian Carlstrom
8fd9944e8f am 32d25fda: am dab766a7: Merge "Switch from core to core-libart" 
* commit '32d25fdabfaadc95292b43a29b695d8229333bcf':
  Switch from core to core-libart
 2014-06-19 02:17:54 +00:00
Ying Wang
451dbd7c00 am cc2e90e6: am 0f1ca830: Merge "Rewrite the clean steps for TARGET_2ND_ARCH." 
* commit 'cc2e90e653c55724f20410347d709b70b1eaf105':
  Rewrite the clean steps for TARGET_2ND_ARCH.
 2014-06-18 22:58:30 +00:00