OSDN Git Service
Edwin Wong [Thu, 24 Jul 2014 01:46:57 +0000 (18:46 -0700)]
Add libdrmclearkeyplugin.so to image.
The library will be added to /system/vendor/lib/mediadrm.
Change-Id: Iebfd00077c2a13e4ad4296aedba21230a7e4f37f
Stephen Hines [Fri, 25 Jul 2014 19:54:37 +0000 (19:54 +0000)]
Merge "Default to "prescott" as our baseline i686 host build architecture." into lmp-dev
Przemyslaw Szczepaniak [Thu, 17 Jul 2014 16:54:41 +0000 (17:54 +0100)]
Switch NDK arm64 libraries to 4.9.
Change-Id: Iffc30e34b798896d9259ca1dfc3ff2d21683d6a4
(cherry picked from commit
5895dd13a7c96a3100048dae8fc1195abc8c9beb)
Stephen Hines [Sat, 19 Jul 2014 00:34:14 +0000 (17:34 -0700)]
Default to "prescott" as our baseline i686 host build architecture.
Bug:
16408818
Change-Id: I41760605bf9f4589859afd20cc96ccbedb6fe82c
Ying Wang [Thu, 24 Jul 2014 03:20:49 +0000 (20:20 -0700)]
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
Dehao Chen [Wed, 23 Jul 2014 23:44:54 +0000 (23:44 +0000)]
Merge "Refactor FDO support code to ensure arm64 can also be built with FDO." into lmp-dev
Dehao Chen [Wed, 23 Jul 2014 21:28:58 +0000 (14:28 -0700)]
Refactor FDO support code to ensure arm64 can also be built with FDO.
Change-Id: I752c9f411b0a046a15c72b4837efc1fb0503b470
Ying Wang [Wed, 23 Jul 2014 23:38:43 +0000 (23:38 +0000)]
Merge "Support to install prebuilt split APKs with LOCAL_PACKAGE_SPLITS" into lmp-dev
Ying Wang [Wed, 23 Jul 2014 21:35:40 +0000 (14:35 -0700)]
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
Ying Wang [Wed, 23 Jul 2014 23:38:29 +0000 (23:38 +0000)]
Merge "Improve rules of split apks." into lmp-dev
Ying Wang [Wed, 23 Jul 2014 17:27:57 +0000 (10:27 -0700)]
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
Ying Wang [Wed, 23 Jul 2014 00:42:35 +0000 (17:42 -0700)]
Delete .swp file added by accident.
Also added .swp to .gitignore.
Change-Id: I51700f55230facde2e46574aa039d45ae5b29cdf
Ying Wang [Tue, 22 Jul 2014 22:42:11 +0000 (15:42 -0700)]
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
Svet Ganov [Wed, 23 Jul 2014 17:12:06 +0000 (17:12 +0000)]
Merge "Add appwidget to system image." into lmp-dev
Yohann Roussel [Thu, 17 Jul 2014 14:52:58 +0000 (16:52 +0200)]
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
100aba5374376f679602387db59fccd609b8abe3)
Change-Id: I39f3ede95ae68777ca5e3db4ab5c6ebeefc86ac6
Daniel Rosenberg [Tue, 22 Jul 2014 22:21:09 +0000 (22:21 +0000)]
Merge "Create a vendor build.prop for verifying versions" into lmp-dev
Daniel Rosenberg [Tue, 22 Jul 2014 00:21:20 +0000 (17:21 -0700)]
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>
Svet Ganov [Mon, 21 Jul 2014 05:58:24 +0000 (22:58 -0700)]
Add appwidget to system image.
Change-Id: I0d5db3f39390065ec5067bb9a15924fdcb181692
Ying Wang [Mon, 21 Jul 2014 16:48:21 +0000 (16:48 +0000)]
Merge "Normalize SDK product name to sdk_<device_type>_<arch_name>" into lmp-dev
Ying Wang [Mon, 21 Jul 2014 16:44:28 +0000 (16:44 +0000)]
Merge "Support "LOCAL_SDK_VERSION := system_current"" into lmp-dev
Baligh Uddin [Sun, 20 Jul 2014 17:24:20 +0000 (10:24 -0700)]
Fix LMP locales
Change-Id: Iee1ac47212139ef9df541aa9f77cec42ded6a0ca
Bug:
13437459
Ying Wang [Sun, 20 Jul 2014 00:00:50 +0000 (17:00 -0700)]
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
Ying Wang [Fri, 13 Jun 2014 01:42:53 +0000 (18:42 -0700)]
Trim down BUILD_FINGERPRINT.
Bug:
15593959
Change-Id: I90161045b5d5f2df726a4f69740f0875c8bfc69f
Conflicts:
core/build_id.mk
Ying Wang [Sat, 19 Jul 2014 02:15:15 +0000 (19:15 -0700)]
Update rule of APPS_ZIP to use the new paths of apks.
Bug:
16319961
Change-Id: I9fc93f329a34e404beaf3fa212772b731a7020ff
Ying Wang [Fri, 18 Jul 2014 22:36:30 +0000 (15:36 -0700)]
Normalize SDK product name to sdk_<device_type>_<arch_name>
Put the common pieces in sdk_base.mk.
Still keep the old names as aliases.
Bug:
16216170
Change-Id: I39a438843c8b09df1aafff142bd9987962f11ef8
Ying Wang [Fri, 18 Jul 2014 16:56:13 +0000 (09:56 -0700)]
Delete vendor and oem staging directory in "make installclean".
Change-Id: If3211772ea37d4c249c2dc5cc69bd9f48a39b6e3
Ying Wang [Sat, 19 Jul 2014 01:19:37 +0000 (01:19 +0000)]
Merge "New installation path for apks and their JNIs." into lmp-dev
Ed Heyl [Sat, 19 Jul 2014 00:41:22 +0000 (00:41 +0000)]
am
fad4676b: (-s ours) am
6190a0c3: back port
cc6be0a3: wrap make. do not merge
* commit '
fad4676b67944acd14d2241ac666bbc5e69b6d54':
back port
cc6be0a3: wrap make. do not merge
Ying Wang [Fri, 18 Jul 2014 04:24:42 +0000 (21:24 -0700)]
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
Ed Heyl [Fri, 18 Jul 2014 18:38:24 +0000 (18:38 +0000)]
am
6190a0c3: back port
cc6be0a3: wrap make. do not merge
* commit '
6190a0c3b33ea43639a7e748182fbac62560a09d':
back port
cc6be0a3: wrap make. do not merge
Ed Heyl [Fri, 18 Jul 2014 17:53:54 +0000 (10:53 -0700)]
back port
cc6be0a3: wrap make. do not merge
Bug:
16368823 | Lunch sets $out with extra text
Change-Id: I2a1d422865a073cd30e86f1e20b4d99a3747cc0b
Ying Wang [Thu, 17 Jul 2014 19:56:49 +0000 (12:56 -0700)]
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
Sebastien Hertz [Tue, 22 Jul 2014 17:00:26 +0000 (17:00 +0000)]
Merge "Vary non-image Xmx for dex2oat on MIPS." into lmp-dev
Ian Rogers [Thu, 17 Jul 2014 05:25:35 +0000 (22:25 -0700)]
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
87f0d006f254dc49621a8cd925b5448344eb367f)
Change-Id: Id4a6d9e8edf00505198c3f3dd599cb7b7f06363a
Tsu Chiang Chuang [Tue, 22 Jul 2014 16:44:54 +0000 (16:44 +0000)]
Merge "Include cts-junit target for cts tests." into lmp-dev
Tsu Chiang Chuang [Thu, 26 Jun 2014 18:40:02 +0000 (11:40 -0700)]
Include cts-junit target for cts tests.
(cherry picked from commit
1949a41e70c70fd71fb8decf9fb2f98aab3b7198)
Change-Id: Ic1d05f0eb1ceb1ac732b57ba1322acd17758b8d3
Ying Wang [Mon, 21 Jul 2014 22:24:31 +0000 (22:24 +0000)]
Merge "Remove framework2" into lmp-dev
Ying Wang [Mon, 21 Jul 2014 21:42:29 +0000 (14:42 -0700)]
Remove framework2
We don't need fraemwork2 split with the multidex framework.jar.
Change-Id: Ifc595b3679946d8958a9282360c7da9bc18e8adc
Ying Wang [Mon, 21 Jul 2014 20:44:06 +0000 (13:44 -0700)]
The order of SDK version matters.
Because some places assumes the last item is the latest public SDK
version number.
Change-Id: I0ac83ab204dcabec0b9399db1bebc77322808074
Sebastien Hertz [Tue, 22 Jul 2014 16:35:13 +0000 (16:35 +0000)]
Merge "Fix the MIPS build." into lmp-dev
Ian Rogers [Thu, 17 Jul 2014 01:06:02 +0000 (18:06 -0700)]
Fix the MIPS build.
Use an override for the dex2oat Xmx value when cross-compiling.
Bug:
16221224
(cherry picked from commit
7d70f830bce969575b358a39e041e85013881cd4)
Change-Id: Ic13b471c74325e8145a0a9c93a417355505e484a
Ying Wang [Mon, 21 Jul 2014 23:06:21 +0000 (16:06 -0700)]
Remove unnecessary dependency of the sdk target.
ALL_GENERATED_SOURCES forces to build heavy things already covered by
build cache.
Change-Id: I362bc450b9e303120d12ee8d53d75e86ef71e58f
Nick Kralevich [Fri, 18 Jul 2014 22:54:26 +0000 (22:54 +0000)]
Merge "runhat: use /data/local/tmp" into lmp-dev
Nick Kralevich [Fri, 18 Jul 2014 22:45:38 +0000 (15:45 -0700)]
runhat: use /data/local/tmp
Use /data/local/tmp for runhat reports, instead of the sdcard.
system_server isn't allowed to handle sdcard file descriptors, since
the sdcard could be ejected at any time, causing the kernel to kill the
system process.
This addresses the following SELinux denial:
W/main ( 9906): type=1400 audit(0.0:16): avc: denied { read write } for path="/mnt/shell/emulated/0/hprof-600" dev="fuse" ino=
3077890536 scontext=u:r:system_server:s0 tcontext=u:object_r:fuse:s0 tclass=file
Bug:
16375996
Change-Id: I4c2053c327526c2f8e6812f4ed911a712ae9a9b8
Ying Wang [Thu, 17 Jul 2014 00:46:35 +0000 (17:46 -0700)]
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
David Friedman [Wed, 16 Jul 2014 13:29:09 +0000 (13:29 +0000)]
am
81415ada: Updated .cs page to accommodate split of NDK into 32- and 64-bit packages.
* commit '
81415adad38fe06f50f381d6317ca0b93848e095':
Updated .cs page to accommodate split of NDK into 32- and 64-bit packages.
Joe LaPenna [Wed, 16 Jul 2014 20:16:24 +0000 (20:16 +0000)]
Merge "Add tvdpi to list of possible recovery asset densities" into lmp-dev
David Friedman [Wed, 16 Jul 2014 13:36:20 +0000 (13:36 +0000)]
am
93848788: am
81415ada: Updated .cs page to accommodate split of NDK into 32- and 64-bit packages.
* commit '
9384878820ec7c881fdf054e8a0a88b2d1b94f64':
Updated .cs page to accommodate split of NDK into 32- and 64-bit packages.
Deepanshu Gupta [Wed, 16 Jul 2014 00:22:00 +0000 (17:22 -0700)]
Fix incremental builds for SDK.
Atree used to output files without escaping the filenames. This resulted
in breaks for incremental builds when filenames contained '$' symbol.
The change fixes this by escaping the filename properly.
Change-Id: I957787b1b3536c64ba6fcb5b4bb5fc60e8b04452
Joe LaPenna [Tue, 15 Jul 2014 23:51:42 +0000 (16:51 -0700)]
Add tvdpi to list of possible recovery asset densities
Bug:
16306251
Change-Id: Iaf2d36d734bb6b639b01e1097723d8387259265b
David Friedman [Tue, 15 Jul 2014 18:38:40 +0000 (11:38 -0700)]
Updated .cs page to accommodate split of NDK into 32- and 64-bit packages.
Change-Id: I33af76d23035067ed740d2bf734708aca8dcffe2
Ed Heyl [Tue, 15 Jul 2014 06:32:28 +0000 (23:32 -0700)]
reconcile aosp (
8689b90bcfdc92c94475901935b5f6efae0c9abc) after branching. Please do not merge.
Change-Id: I0e4c55cc5a04d4593c3cd200c08c48d18c08a161
Guang Zhu [Tue, 15 Jul 2014 02:34:10 +0000 (19:34 -0700)]
DO NOT MERGE: Change build id to LMP
Change-Id: Ic52925bb3f01c5d3f6560f6c9d7a8f4c58500101
Daniel Rosenberg [Mon, 14 Jul 2014 23:32:19 +0000 (23:32 +0000)]
Merge "Added support for building verified vendor partition" into lmp-dev
Daniel Rosenberg [Thu, 10 Jul 2014 22:42:38 +0000 (15:42 -0700)]
Added support for building verified vendor partition
Change-Id: I762724800ccab3a365e6d2efdf86cd9c394818eb
Signed-off-by: Daniel Rosenberg <drosen@google.com>
Colin Cross [Mon, 14 Jul 2014 23:09:48 +0000 (23:09 +0000)]
Merge "HACK: use CPU_ABI hack only for arm64" into lmp-dev
Colin Cross [Mon, 14 Jul 2014 19:34:49 +0000 (12:34 -0700)]
HACK: use CPU_ABI hack only for arm64
The previous hack breaks x86_64, use it only for arm64.
Bug:
15018047
Bug:
16116257
Change-Id: Ia11f237590f7f3c7bc6a25208415b86240d2d6be
Jeff Brown [Mon, 14 Jul 2014 21:43:50 +0000 (21:43 +0000)]
Merge "Build docs for android-support-media-protocols.jar." into lmp-dev
leozwang [Mon, 14 Jul 2014 17:28:38 +0000 (10:28 -0700)]
Remove bcc from generic_no_telephony.mk.
bcc was added into core_minimal.mk.
Change-Id: I29fa6eb3df0dada609e2f6b3e28ffd08d13c6afc
leozwang [Sun, 13 Jul 2014 05:03:52 +0000 (22:03 -0700)]
Add bcc into /system/bin.
Bug:
16161758
Change-Id: I492f6780ecf7d18f291532fc934a80ff7ac643cf
(cherry picked from commit
1bb19d32627fdad6a8c301b152ea26d41f2c8f09)
Jeff Brown [Mon, 14 Jul 2014 11:08:15 +0000 (04:08 -0700)]
Build docs for android-support-media-protocols.jar.
Change-Id: Ib98b1cf3c4ab04594788f5182e616987a64b55be
The Android Automerger [Sun, 13 Jul 2014 20:24:05 +0000 (13:24 -0700)]
"LDW13B"
Baligh Uddin [Sat, 12 Jul 2014 19:26:45 +0000 (12:26 -0700)]
Fix Tamil country code. ta_TN should be ta_IN
Change-Id: I177bc5ba09f0c529409c5a81d67b6dc61d5afdf6
Bug:
16234964
Dan Albert [Fri, 11 Jul 2014 17:46:56 +0000 (17:46 +0000)]
Ying Wang [Fri, 11 Jul 2014 17:32:53 +0000 (17:32 +0000)]
am
c44f69a3: am
9e00b638: am
cd02c025: am
979d578e: Merge "Fix host java doc by referring to the correct classpath."
* commit '
c44f69a38f76415d3f11fe7c3331ea7515fb479d':
Dan Albert [Fri, 11 Jul 2014 17:29:00 +0000 (17:29 +0000)]
am
8f73aeea: am
183f90f4: am
3ffcf184: Merge "Remove -Bsymbolic from builds."
* commit '
8f73aeea87f96d715ca2f39a35fd73986feecceb':
Remove -Bsymbolic from builds.
Ying Wang [Fri, 11 Jul 2014 16:18:43 +0000 (16:18 +0000)]
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.
Raph Levien [Fri, 11 Jul 2014 14:52:22 +0000 (14:52 +0000)]
Merge "Add Zopfli-recompress option to zipalign"
Geremy Condra [Thu, 10 Jul 2014 23:35:32 +0000 (23:35 +0000)]
Merge "Add support for signed boot images."
Geremy Condra [Wed, 9 Jul 2014 03:07:41 +0000 (20:07 -0700)]
Add support for signed boot images.
Geremy Condra [Thu, 10 Jul 2014 21:39:17 +0000 (21:39 +0000)]
Merge "Revert "Add support for signed boot images.""
Geremy Condra [Thu, 10 Jul 2014 21:29:24 +0000 (21:29 +0000)]
Revert "Add support for signed boot images."
This reverts commit
7e2c5ed84f59c4f19e2baa02733e85006292156e.
Change-Id: Id90e3b2d986fac3ac9b2748194747af712ac4ab1
Geremy Condra [Wed, 9 Jul 2014 03:07:41 +0000 (20:07 -0700)]
Add support for signed boot images.
Change-Id: Ib08fc700f626d838efa9a543316afbcd4b782525
Geremy Condra [Thu, 10 Jul 2014 19:32:39 +0000 (19:32 +0000)]
Merge "Add support for signed boot images."
Colin Cross [Thu, 10 Jul 2014 09:43:33 +0000 (09:43 +0000)]
am
50fb938f: am
ec5563b5: Merge "build: fix host dex2oat runtime args"
* commit '
50fb938f79387ab92ed3b64194da47b146d74db6':
build: fix host dex2oat runtime args
Colin Cross [Thu, 10 Jul 2014 06:33:08 +0000 (06:33 +0000)]
am
ec5563b5: Merge "build: fix host dex2oat runtime args"
* commit '
ec5563b55146372fe33ebd4fc13661d811b77323':
build: fix host dex2oat runtime args
Paul Jensen [Thu, 10 Jul 2014 19:05:25 +0000 (19:05 +0000)]
Merge "Add app to handle captive portal login."
Paul Jensen [Thu, 10 Jul 2014 01:49:12 +0000 (21:49 -0400)]
Add app to handle captive portal login.
This app is only used if no other app handles the broadcast to perform captive
portal login.
Bug:
15409233
Bug:
15409354
Change-Id: Ie240d7eac4bdbab8cc7578782bd72d8b26de7951
Colin Cross [Thu, 10 Jul 2014 11:05:13 +0000 (11:05 +0000)]
am
5c75fa65: am
50fb938f: am
ec5563b5: Merge "build: fix host dex2oat runtime args"
* commit '
5c75fa6561b7b58ae8f024bc6936433242cc9b43':
build: fix host dex2oat runtime args
Ying Wang [Thu, 10 Jul 2014 00:42:53 +0000 (00:42 +0000)]
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
Ying Wang [Thu, 10 Jul 2014 00:42:52 +0000 (00:42 +0000)]
am
baad790d: am
f27e3fb4: am
c35cc93d: Merge "Allow symlinks to device or vendor tree in envsetup.sh."
* commit '
baad790de671f680d6584edc4712a9cde823f49c':
Allow symlinks to device or vendor tree in envsetup.sh.
Ying Wang [Thu, 10 Jul 2014 00:16:48 +0000 (00:16 +0000)]
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
Ying Wang [Thu, 10 Jul 2014 00:16:48 +0000 (00:16 +0000)]
am
f27e3fb4: am
c35cc93d: Merge "Allow symlinks to device or vendor tree in envsetup.sh."
* commit '
f27e3fb4cf1d51f3abd5261d5626997c71df22b7':
Allow symlinks to device or vendor tree in envsetup.sh.
Ying Wang [Thu, 10 Jul 2014 00:08:18 +0000 (00:08 +0000)]
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
Ying Wang [Thu, 10 Jul 2014 00:08:13 +0000 (00:08 +0000)]
am
c35cc93d: Merge "Allow symlinks to device or vendor tree in envsetup.sh."
* commit '
c35cc93d3b12880ae4de00ae9ef867ab91dbc412':
Allow symlinks to device or vendor tree in envsetup.sh.
Ying Wang [Wed, 9 Jul 2014 23:18:08 +0000 (23:18 +0000)]
Merge "Don't enable LOCAL_DEX_PREOPT for apks outside system.img"
Ying Wang [Wed, 9 Jul 2014 22:40:33 +0000 (22:40 +0000)]
Merge "Allow symlinks to device or vendor tree in envsetup.sh."
Ying Wang [Wed, 9 Jul 2014 22:37:34 +0000 (15:37 -0700)]
Allow symlinks to device or vendor tree in envsetup.sh.
Change-Id: I1190a0b1c84fa17b3692427eb6071ffbe84bc529
Ying Wang [Wed, 9 Jul 2014 17:57:32 +0000 (10:57 -0700)]
Don't enable LOCAL_DEX_PREOPT for apks outside system.img
Bug:
15621103
Change-Id: If267a4aaad17b66d9779169237e06d65d67f088f
Brian Carlstrom [Wed, 9 Jul 2014 15:07:13 +0000 (15:07 +0000)]
am
ef0b6e0c: am
8a749606: am
02a5b517: Merge "Make dex2oat heap size product configurable [build]"
* commit '
ef0b6e0c19eb37f4fbc42491771611e247168519':
Make dex2oat heap size product configurable [build]
Ying Wang [Wed, 9 Jul 2014 15:07:12 +0000 (15:07 +0000)]
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.
Deepanshu Gupta [Wed, 9 Jul 2014 14:42:43 +0000 (14:42 +0000)]
am
042c8a06: (-s ours) am
f0200e87: am
72146221: am
0b3aa00e: am
da111964: (-s ours) am
d23dcdf1: am
a0130a4d: am
9915a60c: (-s ours) am
1bb64302: am
1699a434: am
075f7751: Integrate build_font.py [DO NOT MERGE]
* commit '
042c8a06c1fce45856d49ae73c06f1eb7043669f':
Integrate build_font.py [DO NOT MERGE]
Colin Cross [Thu, 10 Jul 2014 06:10:50 +0000 (06:10 +0000)]
Merge "build: fix host dex2oat runtime args"
Colin Cross [Thu, 10 Jul 2014 05:09:50 +0000 (22:09 -0700)]
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
Brian Carlstrom [Wed, 9 Jul 2014 12:36:31 +0000 (12:36 +0000)]
am
8a749606: am
02a5b517: Merge "Make dex2oat heap size product configurable [build]"
* commit '
8a7496060df85c241b976d6cd69b13828e452ef9':
Make dex2oat heap size product configurable [build]
Ying Wang [Wed, 9 Jul 2014 12:36:30 +0000 (12:36 +0000)]
am
ce40d5f9: am
bc7501e1: Merge "More consistent use of 64-bit build variable."
* commit '
ce40d5f99e9c0658aab9539bf8afa253dfd985e4':
More consistent use of 64-bit build variable.
Deepanshu Gupta [Wed, 9 Jul 2014 12:23:47 +0000 (12:23 +0000)]
am
75cdce7b: (-s ours) am
98da9070: am
307a8ec9: am
8eaddc6c: am
071a2f83: (-s ours) am
ea2f4e3c: am
daee7822: Integrate build_font.py [DO NOT MERGE]
* commit '
75cdce7bd6f821eb4103f496fcd3cfbf82c66269':
Integrate build_font.py [DO NOT MERGE]
smain@google.com [Wed, 9 Jul 2014 12:23:46 +0000 (12:23 +0000)]
am
afb83c6b: (-s ours) am
62cf72b0: am
60d43dde: (-s ours) am
97539b1c: DO NOT MERGE revise butter bar message for clarity
* commit '
afb83c6b3ca9935f7ad89a549105b27fb40f5fdb':
DO NOT MERGE revise butter bar message for clarity
Brian Carlstrom [Wed, 9 Jul 2014 12:21:56 +0000 (12:21 +0000)]
am
02a5b517: Merge "Make dex2oat heap size product configurable [build]"
* commit '
02a5b51798b06434b08ffe2f6e6c485e73cd42bc':
Make dex2oat heap size product configurable [build]
Ying Wang [Wed, 9 Jul 2014 12:21:48 +0000 (12:21 +0000)]
am
bc7501e1: Merge "More consistent use of 64-bit build variable."
* commit '
bc7501e10324caf1318769901d8a382d46be0b60':
More consistent use of 64-bit build variable.
OSDN Git Service
