OSDN Git Service
Tim Murray [Fri, 25 Jul 2014 01:03:35 +0000 (01:03 +0000)]
Tim Murray [Fri, 25 Jul 2014 01:03:32 +0000 (01:03 +0000)]
am
eb9563f9: am
16d43086: Merge "Fix Windows SDK build to not use clang."
* commit '
eb9563f9ab610ca09bf99c6975f70c14c35683bd':
Fix Windows SDK build to not use clang.
Ying Wang [Thu, 24 Jul 2014 23:30:47 +0000 (23:30 +0000)]
am
6aef0473: Support to set up TARGET_COPY_OUT_VENDOR in board config.
* commit '
6aef04736294976b3bedaae5cb581a01f6387cc7':
Support to set up TARGET_COPY_OUT_VENDOR in board config.
Tim Murray [Thu, 24 Jul 2014 22:25:59 +0000 (22:25 +0000)]
Tim Murray [Thu, 24 Jul 2014 22:12:14 +0000 (22:12 +0000)]
am
16d43086: Merge "Fix Windows SDK build to not use clang."
* commit '
16d43086e91b76876f195b6d7a7c2e9d021b8293':
Fix Windows SDK build to not use clang.
Tim Murray [Thu, 24 Jul 2014 22:20:58 +0000 (22:20 +0000)]
Merge "fix build"
Tim Murray [Thu, 24 Jul 2014 22:20:18 +0000 (15:20 -0700)]
fix build
Change-Id: I28799d5523e1d2d2500a82b3d323c58486aacdbc
Tim Murray [Thu, 24 Jul 2014 21:42:53 +0000 (14:42 -0700)]
Fix Windows SDK build to not use clang.
bug
16172793
Change-Id: I7bf76cae49ec17bf50eb657b0e38234b7cb55e85
Tim Murray [Thu, 24 Jul 2014 21:27:05 +0000 (14:27 -0700)]
resolved conflicts for merge of
2812b27c to lmp-dev-plus-aosp
Change-Id: I770fbf16affbd43b0750b50426298038e4b573b7
Tim Murray [Thu, 24 Jul 2014 21:04:24 +0000 (21:04 +0000)]
am
f82de5b8: Merge "Switch host builds to use Clang by default."
* commit '
f82de5b89d70fb0e122f03a3956c5b01e66daca5':
Switch host builds to use Clang by default.
Dehao Chen [Thu, 24 Jul 2014 19:46:34 +0000 (19:46 +0000)]
am
1cd46385: Merge "Refactor FDO support code to ensure arm64 can also be built with FDO." into lmp-dev
* commit '
1cd4638594d21ca4643b3b96c894f93a0bd1e87a':
Refactor FDO support code to ensure arm64 can also be built with FDO.
Ying Wang [Thu, 24 Jul 2014 19:46:33 +0000 (19:46 +0000)]
am
e7998698: Merge "Support to install prebuilt split APKs with LOCAL_PACKAGE_SPLITS" into lmp-dev
* commit '
e7998698236cf460b91f4245a5447498015cf439':
Support to install prebuilt split APKs with LOCAL_PACKAGE_SPLITS
Ying Wang [Thu, 24 Jul 2014 19:46:32 +0000 (19:46 +0000)]
am
0d660660: Merge "Improve rules of split apks." into lmp-dev
* commit '
0d660660dbdd84391c14cf21396d4f4fff923085':
Improve rules of split apks.
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
Ying Wang [Thu, 24 Jul 2014 01:49:26 +0000 (01:49 +0000)]
am
5d23800f: am
1bb9adb8: Merge "[MIPS64] Enable mips64 clang"
* commit '
5d23800f2b61c03a97395815e94d2aa44eea8577':
[MIPS64] Enable mips64 clang
Ying Wang [Thu, 24 Jul 2014 01:45:53 +0000 (01:45 +0000)]
am
1bb9adb8: Merge "[MIPS64] Enable mips64 clang"
* commit '
1bb9adb88004ebdbacf44a95bd4e08065960c5ab':
[MIPS64] Enable mips64 clang
Ying Wang [Wed, 23 Jul 2014 23:41:18 +0000 (23:41 +0000)]
am
ebe0bacc: am
6837ac67: Merge "Refactor FDO support code to ensure arm64 can also be built with FDO."
* commit '
ebe0bacc8063f74da5bacb80c5e0b97a00a7351c':
Refactor FDO support code to ensure arm64 can also be built with FDO.
Ying Wang [Wed, 23 Jul 2014 23:37:56 +0000 (23:37 +0000)]
am
6837ac67: Merge "Refactor FDO support code to ensure arm64 can also be built with FDO."
* commit '
6837ac67035518f5c36c91ae07ec95010c7071bd':
Refactor FDO support code to ensure arm64 can also be built with FDO.
Tim Murray [Thu, 24 Jul 2014 22:08:41 +0000 (22:08 +0000)]
Merge "Fix Windows SDK build to not use clang."
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 [Thu, 24 Jul 2014 01:42:13 +0000 (01:42 +0000)]
Merge "[MIPS64] Enable mips64 clang"
Duane Sand [Tue, 3 Jun 2014 23:05:59 +0000 (16:05 -0700)]
[MIPS64] Enable mips64 clang
Change-Id: I737f40ff1d4c71c21bea5159d1b0acee89fe32a2
Tim Murray [Thu, 24 Jul 2014 20:59:29 +0000 (20:59 +0000)]
Merge "Switch host builds to use Clang by default."
Tim Murray [Fri, 4 Apr 2014 21:38:29 +0000 (14:38 -0700)]
Switch host builds to use Clang by default.
If LOCAL_CLANG is not set to false for a host module, clang will be used instead of gcc.
This also enables the integrated assembler by default for Darwin host builds.
bug
16172793
Change-Id: If7484c5dbcccce7d925bec97bff0a3e4c30e9434
Ying Wang [Wed, 23 Jul 2014 23:35:05 +0000 (23:35 +0000)]
Merge "Refactor FDO support code to ensure arm64 can also be built with FDO."
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
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
Svet Ganov [Wed, 23 Jul 2014 17:24:15 +0000 (17:24 +0000)]
am
6693649a: Merge "Add appwidget to system image." into lmp-dev
* commit '
6693649a42177484c6439912c1d56712378a851c':
Add appwidget to system image.
Yohann Roussel [Wed, 23 Jul 2014 17:03:23 +0000 (17:03 +0000)]
am
c324a624: Put only src in FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS for multidex
* commit '
c324a624256da3e53cea5a6c3e2b57937fc6ac24':
Put only src in FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS for multidex
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
Ying Wang [Wed, 23 Jul 2014 00:53:57 +0000 (00:53 +0000)]
am
84c26b69: Delete .swp file added by accident.
* commit '
84c26b694978eb6b9ee9400d15283707ea9b3eb9':
Delete .swp file added by accident.
Ying Wang [Wed, 23 Jul 2014 00:50:09 +0000 (00:50 +0000)]
am
1425e2d8: Support LOCAL_PACKAGE_SPLITS.
* commit '
1425e2d8c08663987f2d1004c55e6060d1ce6dfe':
Support LOCAL_PACKAGE_SPLITS.
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
Daniel Rosenberg [Tue, 22 Jul 2014 22:29:17 +0000 (22:29 +0000)]
am
337bbf89: Merge "Create a vendor build.prop for verifying versions" into lmp-dev
* commit '
337bbf89d92f28bff85273ffefb71d3e5d7f57fc':
Create a vendor build.prop for verifying versions
Stephen Hines [Tue, 22 Jul 2014 20:53:44 +0000 (20:53 +0000)]
am
786c565e: am
38470c3f: Merge "Default to "prescott" as our baseline i686 host build architecture."
* commit '
786c565ea440de736af66b1b36ee72b6287bc1cc':
Default to "prescott" as our baseline i686 host build architecture.
Stephen Hines [Tue, 22 Jul 2014 20:49:15 +0000 (20:49 +0000)]
am
38470c3f: Merge "Default to "prescott" as our baseline i686 host build architecture."
* commit '
38470c3fffd25a300045d62cccc8ab129cb71349':
Default to "prescott" as our baseline i686 host build architecture.
Sebastien Hertz [Tue, 22 Jul 2014 17:13:40 +0000 (17:13 +0000)]
am
3389b9e8: Merge "Vary non-image Xmx for dex2oat on MIPS." into lmp-dev
* commit '
3389b9e88752a2b3a20fd6fea04ac6bedeec4afc':
Vary non-image Xmx for dex2oat on MIPS.
Tsu Chiang Chuang [Tue, 22 Jul 2014 17:00:28 +0000 (17:00 +0000)]
am
64a06072: Merge "Include cts-junit target for cts tests." into lmp-dev
* commit '
64a0607262c11beb4421b4902091078785dcf77d':
Include cts-junit target for cts tests.
Sebastien Hertz [Tue, 22 Jul 2014 16:51:05 +0000 (18:51 +0200)]
resolved conflicts for merge of
2715dc67 to lmp-dev-plus-aosp
Change-Id: I48365572b92429659069b87250cae21a135cf155
Ying Wang [Tue, 22 Jul 2014 16:36:37 +0000 (16:36 +0000)]
am
ab4a98a8: Remove unnecessary dependency of the sdk target.
* commit '
ab4a98a85d0af425904af81c72627457292c147f':
Remove unnecessary dependency of the sdk target.
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
Stephen Hines [Tue, 22 Jul 2014 20:45:32 +0000 (20:45 +0000)]
Merge "Default to "prescott" as our baseline i686 host build architecture."
Svet Ganov [Wed, 23 Jul 2014 17:12:06 +0000 (17:12 +0000)]
Merge "Add appwidget to system image." into lmp-dev
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>
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 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
Ying Wang [Mon, 21 Jul 2014 22:36:34 +0000 (22:36 +0000)]
am
0ea63e0c: Merge "Remove framework2" into lmp-dev
* commit '
0ea63e0cbd974863f9c828951d3a9228de962db6':
Remove framework2
Ying Wang [Mon, 21 Jul 2014 20:53:00 +0000 (20:53 +0000)]
am
2f7b92c9: The order of SDK version matters.
* commit '
2f7b92c90a5e58619fc88d5c7f4d8c36276a7b18':
The order of SDK version matters.
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
Ying Wang [Mon, 21 Jul 2014 16:56:57 +0000 (16:56 +0000)]
am
04862007: Merge "Normalize SDK product name to sdk_<device_type>_<arch_name>" into lmp-dev
* commit '
0486200762a0be6080579dd60044ae3ff88f616a':
Normalize SDK product name to sdk_<device_type>_<arch_name>
Ying Wang [Mon, 21 Jul 2014 16:53:18 +0000 (16:53 +0000)]
am
f55b304f: Merge "Support "LOCAL_SDK_VERSION := system_current"" into lmp-dev
* commit '
f55b304fd1ae10f47c97583f9faae002fde4f4ee':
Support "LOCAL_SDK_VERSION := system_current"
Svet Ganov [Mon, 21 Jul 2014 05:58:24 +0000 (22:58 -0700)]
Add appwidget to system image.
Change-Id: I0d5db3f39390065ec5067bb9a15924fdcb181692
Baligh Uddin [Sun, 20 Jul 2014 18:09:28 +0000 (18:09 +0000)]
am
cb3fe9a3: Fix LMP locales
* commit '
cb3fe9a33680b887db316c84e7066896075a471d':
Fix LMP locales
Ying Wang [Sun, 20 Jul 2014 18:04:09 +0000 (18:04 +0000)]
am
50367cc7: Trim down BUILD_FINGERPRINT.
* commit '
50367cc77db4f576f6e7421e6b302395d202482e':
Trim down BUILD_FINGERPRINT.
Ying Wang [Sun, 20 Jul 2014 18:03:02 +0000 (18:03 +0000)]
am
2ce3d5c4: Update rule of APPS_ZIP to use the new paths of apks.
* commit '
2ce3d5c4ae4e5eb20d4e76931947a02bd54c3101':
Update rule of APPS_ZIP to use the new paths of apks.
Ying Wang [Sun, 20 Jul 2014 18:02:15 +0000 (18:02 +0000)]
am
5a5aa71f: Merge "New installation path for apks and their JNIs." into lmp-dev
* commit '
5a5aa71f6cf43355dfd8c86501eb946be499cdd0':
New installation path for apks and their JNIs.
Ed Heyl [Sun, 20 Jul 2014 18:01:03 +0000 (18:01 +0000)]
am
65834183: am
fad4676b: (-s ours) am
6190a0c3: back port
cc6be0a3: wrap make. do not merge
* commit '
65834183bf18a5c03a8d7faf73c2a36fd008c99a':
back port
cc6be0a3: wrap make. do not merge
Baligh Uddin [Sun, 20 Jul 2014 17:24:20 +0000 (10:24 -0700)]
Fix LMP locales
Change-Id: Iee1ac47212139ef9df541aa9f77cec42ded6a0ca
Bug:
13437459
Nick Kralevich [Sun, 20 Jul 2014 02:18:27 +0000 (02:18 +0000)]
am
1756474d: Merge "runhat: use /data/local/tmp" into lmp-dev
* commit '
1756474d873130d3340310782bc397733c80a8b6':
runhat: use /data/local/tmp
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 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 16:44:28 +0000 (16:44 +0000)]
Merge "Support "LOCAL_SDK_VERSION := system_current"" into lmp-dev
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
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
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 [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
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 [Fri, 18 Jul 2014 17:02:46 +0000 (17:02 +0000)]
am
42218736: Delete vendor and oem staging directory in "make installclean".
* commit '
4221873693a3383c1331176b3825bcfcc997aa5a':
Delete vendor and oem staging directory in "make installclean".
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
Yohann Roussel [Fri, 18 Jul 2014 14:47:52 +0000 (14:47 +0000)]
am
d825997d: am
1029013a: Merge "Put only src in FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS for multidex"
* commit '
d825997d8765efd074279ec10ee11eda1f1bb196':
Put only src in FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS for multidex
Yohann Roussel [Fri, 18 Jul 2014 14:43:47 +0000 (14:43 +0000)]
am
1029013a: Merge "Put only src in FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS for multidex"
* commit '
1029013a0db29b926da93d2400b181d1c3b495fe':
Put only src in FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS for multidex
Yohann Roussel [Fri, 18 Jul 2014 13:02:02 +0000 (13:02 +0000)]
am
60c0454d: (-s ours) am
d5389ba4: Merge "Move multidex support library"
* commit '
60c0454d1dda493f9f2afa222cde8f1f89618604':
Move multidex support library
Yohann Roussel [Fri, 18 Jul 2014 12:54:32 +0000 (12:54 +0000)]
am
368a6f44: (-s ours) am
182ac4e3: Merge "Stubs of android-support-multidex-instrumentation."
* commit '
368a6f44a9b6855ca771f18f1cec696bc75a954b':
Stubs of android-support-multidex-instrumentation.
Yohann Roussel [Fri, 18 Jul 2014 12:48:07 +0000 (12:48 +0000)]
am
189f9522: (-s ours) am
2d3e4d22: Merge "Generates SDK stubs of android-support-multidex"
* commit '
189f95221cbe673675fa9719e3c39db8e3b30bb0':
Generates SDK stubs of android-support-multidex
Yohann Roussel [Fri, 18 Jul 2014 12:01:41 +0000 (12:01 +0000)]
am
9b457ea0: am
34ba2331: Merge "Support dx generating multiple dex files."
* commit '
9b457ea066cd5624d2ca21db20c6366077f84405':
Support dx generating multiple dex files.
Yohann Roussel [Fri, 18 Jul 2014 10:55:07 +0000 (10:55 +0000)]
am
d5389ba4: Merge "Move multidex support library"
* commit '
d5389ba4163a1a8506ab91fb287c1167a3de521f':
Move multidex support library
Yohann Roussel [Fri, 18 Jul 2014 10:55:06 +0000 (10:55 +0000)]
am
182ac4e3: Merge "Stubs of android-support-multidex-instrumentation."
* commit '
182ac4e3fd5bf9397bf5f8397e2cc599e761e16b':
Stubs of android-support-multidex-instrumentation.
Yohann Roussel [Fri, 18 Jul 2014 10:55:05 +0000 (10:55 +0000)]
am
2d3e4d22: Merge "Generates SDK stubs of android-support-multidex"
* commit '
2d3e4d22d9a97837a1545a563c5d2e7e4b915040':
Generates SDK stubs of android-support-multidex
Yohann Roussel [Fri, 18 Jul 2014 10:55:05 +0000 (10:55 +0000)]
am
34ba2331: Merge "Support dx generating multiple dex files."
* commit '
34ba2331f7caec3dc5df97024fa8bf57c9e5d045':
Support dx generating multiple dex files.
Ying Wang [Thu, 17 Jul 2014 23:47:39 +0000 (23:47 +0000)]
am
3e72ed17: Fail build if non-symlink /system/vendor detected while we are building
* commit '
3e72ed17a557d0db6733ca6cba1f36e85f57460d':
Fail build if non-symlink /system/vendor detected while we are building
Yohann Roussel [Fri, 18 Jul 2014 14:40:29 +0000 (14:40 +0000)]
Merge "Put only src in FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS for multidex"
Yohann Roussel [Fri, 18 Jul 2014 10:51:19 +0000 (10:51 +0000)]
Merge "Stubs of android-support-multidex-instrumentation."
Yohann Roussel [Fri, 18 Jul 2014 10:51:33 +0000 (10:51 +0000)]
Merge "Move multidex support library"
Yohann Roussel [Fri, 18 Jul 2014 10:51:09 +0000 (10:51 +0000)]
Merge "Generates SDK stubs of android-support-multidex"
Yohann Roussel [Fri, 18 Jul 2014 10:50:56 +0000 (10:50 +0000)]
Merge "Support dx generating multiple dex files."
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
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
Ying Wang [Thu, 17 Jul 2014 21:51:13 +0000 (14:51 -0700)]
resolved conflicts for merge of
ef44fb2d to lmp-dev-plus-aosp
Change-Id: I5551e6b1303f2b37d199a1b894f37c50839fdecc
Ying Wang [Thu, 17 Jul 2014 21:13:55 +0000 (21:13 +0000)]
am
0b30c5f0: Merge "Remove linker64 and debuggerd64"
* commit '
0b30c5f0b5d70ecc7599f33ccd226f62e176872f':
Remove linker64 and debuggerd64
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