OSDN Git Service
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
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
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
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 [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
Ying Wang [Thu, 17 Jul 2014 21:07:59 +0000 (21:07 +0000)]
Merge "Remove linker64 and debuggerd64"
Ying Wang [Thu, 17 Jul 2014 20:59:59 +0000 (13:59 -0700)]
Remove linker64 and debuggerd64
We don't have separate *64 module names any more.
Now both 32-bit and 64-bit variants are built under the same module name.
Change-Id: I1956a6a88ec6fe280798be01928239d098dfe27a
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 17:06:21 +0000 (17:06 +0000)]
am
cff38625: Include vendor.img in PDK build.
* commit '
cff386250f822f32b488d0632ef1936065df7650':
Include vendor.img in PDK build.
Joe LaPenna [Thu, 17 Jul 2014 17:00:15 +0000 (17:00 +0000)]
am
683d9867: Merge "Add tvdpi to list of possible recovery asset densities" into lmp-dev
* commit '
683d9867b54aea2402a569455da52fb174f39073':
Add tvdpi to list of possible recovery asset densities
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.
Change-Id: Icd6903a43c90efc08eba92976dddb104c45a5e43
Ian Rogers [Thu, 17 Jul 2014 13:00:55 +0000 (13:00 +0000)]
am
fab98ef6: am
bc30611f: Merge "Vary non-image Xmx for dex2oat on MIPS."
* commit '
fab98ef6d4398a394f10f764c5dc0f42e2792d65':
Vary non-image Xmx for dex2oat on MIPS.
Ying Wang [Thu, 17 Jul 2014 13:00:54 +0000 (13:00 +0000)]
am
7d50394b: am
e1caecfa: Merge "Fix the MIPS build."
* commit '
7d50394bd76ebbcfffcf5e8fff0f23bd35459a0d':
Fix the MIPS build.
Ian Rogers [Thu, 17 Jul 2014 12:30:33 +0000 (12:30 +0000)]
am
bc30611f: Merge "Vary non-image Xmx for dex2oat on MIPS."
* commit '
bc30611f8e08361a41c7e78c799732a7f685e568':
Vary non-image Xmx for dex2oat on MIPS.
Ying Wang [Thu, 17 Jul 2014 12:30:31 +0000 (12:30 +0000)]
am
e1caecfa: Merge "Fix the MIPS build."
* commit '
e1caecfaa2c9b5165e5a0f31faac1b983b5d128a':
Fix the MIPS build.
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
Ian Rogers [Thu, 17 Jul 2014 06:14:28 +0000 (06:14 +0000)]
Merge "Vary non-image Xmx for dex2oat on MIPS."
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.
Change-Id: Idd508187ce8ac3d3c8dbe357c74bc33a5c8185dd
Ying Wang [Thu, 17 Jul 2014 01:12:36 +0000 (01:12 +0000)]
Merge "Fix the MIPS build."
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
Change-Id: Iaeac95cd50a0bae7817ee7da23b3cf25246f1d6d
Maurice Chu [Wed, 16 Oct 2013 21:30:42 +0000 (14:30 -0700)]
Move multidex support library
Multidex is being moved from frameworks/support/multidex to
frameworks/multidex.
GMS Core will be using the multidex library and has gotten special
approval to use the unreleased multidex library (i.e., guinea pig).
Bug:
10674263
Change-Id: I31f582dd7adf4db6eb19c52357875594fc9f7829
David Friedman [Wed, 16 Jul 2014 13:54:43 +0000 (13:54 +0000)]
am
ba6dc727: am
93848788: am
81415ada: Updated .cs page to accommodate split of NDK into 32- and 64-bit packages.
* commit '
ba6dc7272c11ba00111fa897dc937db9745a76f4':
Updated .cs page to accommodate split of NDK into 32- and 64-bit packages.
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.
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
Yohann Roussel [Wed, 4 Sep 2013 10:19:46 +0000 (12:19 +0200)]
Stubs of android-support-multidex-instrumentation.
For the SDK.
(cherry picked from commit
584f6019106e5adc87f0f1a3bac75c31efe67f36)
Change-Id: I64b7d279a575c201c4df52a6bd3caa75baf58d11
Yohann Roussel [Wed, 21 Aug 2013 12:19:44 +0000 (14:19 +0200)]
Generates SDK stubs of android-support-multidex
(cherry picked from commit
c4441b8c3701147365213a1f789626a8d442db6e)
Conflicts:
core/pathmap.mk
Change-Id: I9283e793d8cdbd4003b86fd33ff62dd35c663f1f
Yohann Roussel [Tue, 20 Aug 2013 15:05:27 +0000 (17:05 +0200)]
Support dx generating multiple dex files.
Dx is now capable of generating multiple dex file in one run.
This capability is not compatible with --output=*.dex so this CL
changes the --output argument to be a directory. This CL also
includes the packaging of the multiple dex files when dx generates
more than one dex file.
(cherry picked from commit
8ffe9c3e7967ec9c6c6e9a03095454dc1b073c3b)
Conflicts:
core/java.mk
Change-Id: I1ddc91b416de5929d4d4b41824c6012b32f94deb
Deepanshu Gupta [Wed, 16 Jul 2014 00:45:02 +0000 (00:45 +0000)]
am
9c5564e0: Fix incremental builds for SDK.
* commit '
9c5564e060b019d154b07fca3513443039266145':
Fix incremental builds for SDK.
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 17:01:35 +0000 (17:01 +0000)]
am
f6771f63: reconcile aosp (
8689b90bcfdc92c94475901935b5f6efae0c9abc) after branching. Please do not merge.
* commit '
f6771f631b814189d83b9b16cfa73d1466f932af':
reconcile aosp (
8689b90bcfdc92c94475901935b5f6efae0c9abc) after branching. Please do not merge.
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 03:04:48 +0000 (03:04 +0000)]
am
4f892ab7: DO NOT MERGE: Change build id to LMP
* commit '
4f892ab728798dab39812e2dcf38bec5b2a112ea':
DO NOT MERGE: Change build id to LMP
Guang Zhu [Tue, 15 Jul 2014 02:34:10 +0000 (19:34 -0700)]
DO NOT MERGE: Change build id to LMP
Change-Id: Ic52925bb3f01c5d3f6560f6c9d7a8f4c58500101
Ying Wang [Tue, 15 Jul 2014 01:31:14 +0000 (01:31 +0000)]
am
7beaea15: am
15d00664: Merge "Revert "Fix Java detection on some Linux distributions""
* commit '
7beaea15f001eb9f51cfe38d6c87c9fca2100a63':
Revert "Fix Java detection on some Linux distributions"
Ying Wang [Tue, 15 Jul 2014 01:27:42 +0000 (01:27 +0000)]
am
15d00664: Merge "Revert "Fix Java detection on some Linux distributions""
* commit '
15d00664884b9b8ce4766ab3a7fd15b83cbeaad9':
Revert "Fix Java detection on some Linux distributions"
Ying Wang [Tue, 15 Jul 2014 01:23:49 +0000 (01:23 +0000)]
Merge "Revert "Fix Java detection on some Linux distributions""
Ying Wang [Tue, 15 Jul 2014 01:22:50 +0000 (01:22 +0000)]
Revert "Fix Java detection on some Linux distributions"
This reverts commit
09040dd8232f8fe588d938e04581ba1648f452f4.
Change-Id: Iafb126a6200e259f4176d903bacf8d3de28c6d97
Daniel Rosenberg [Mon, 14 Jul 2014 23:44:18 +0000 (23:44 +0000)]
am
f3bcb2d4: Merge "Added support for building verified vendor partition" into lmp-dev
* commit '
f3bcb2d4c3a4b7e3b67805e964571f7346b7af80':
Added support for building verified vendor partition
Colin Cross [Mon, 14 Jul 2014 23:21:12 +0000 (23:21 +0000)]
am
f4535b25: Merge "HACK: use CPU_ABI hack only for arm64" into lmp-dev
* commit '
f4535b257f6ca60545b50952886c3d1e35a339f0':
HACK: use CPU_ABI hack only for arm64
Jeff Brown [Mon, 14 Jul 2014 22:25:04 +0000 (22:25 +0000)]
am
4d7769ae: Merge "Build docs for android-support-media-protocols.jar." into lmp-dev
* commit '
4d7769aea21c116a68725e6888c140677470c35c':
Build docs for android-support-media-protocols.jar.
leozwang [Mon, 14 Jul 2014 22:24:44 +0000 (22:24 +0000)]
am
32404833: Remove bcc from generic_no_telephony.mk.
* commit '
324048338323aac4bdc497698391292c4561a557':
Remove bcc from generic_no_telephony.mk.
Ying Wang [Mon, 14 Jul 2014 21:44:57 +0000 (21:44 +0000)]
am
3017e13f: am
c7f1389d: Merge "Fix Java detection on some Linux distributions"
* commit '
3017e13fc8556420a2c0fb8f4a38a866b6689e0a':
Fix Java detection on some Linux distributions
Ying Wang [Mon, 14 Jul 2014 21:40:49 +0000 (21:40 +0000)]
am
c7f1389d: Merge "Fix Java detection on some Linux distributions"
* commit '
c7f1389d2683be9068d22666b484e48abcff12f1':
Fix Java detection on some Linux distributions
leozwang [Mon, 14 Jul 2014 21:01:45 +0000 (21:01 +0000)]
am
38bbc70d: Add bcc into /system/bin.
* commit '
38bbc70d045b46b9f3389f0c2693bcff6083b297':
Add bcc into /system/bin.
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
The Android Automerger [Mon, 14 Jul 2014 20:44:15 +0000 (20:44 +0000)]
Baligh Uddin [Mon, 14 Jul 2014 20:44:14 +0000 (20:44 +0000)]
am
af0aa3ca: Fix Tamil country code. ta_TN should be ta_IN
* commit '
af0aa3ca6d5888b0d7e2c1a279ad129d9c1536cd':
Fix Tamil country code. ta_TN should be ta_IN
Dan Albert [Mon, 14 Jul 2014 20:44:12 +0000 (20:44 +0000)]
Ying Wang [Mon, 14 Jul 2014 20:44:10 +0000 (20:44 +0000)]
am
5df55f3d: am
c44f69a3: am
9e00b638: am
cd02c025: am
979d578e: Merge "Fix host java doc by referring to the correct classpath."
* commit '
5df55f3db8a672c94ef7406447ee8ec1c0d8732f':
Raph Levien [Mon, 14 Jul 2014 20:44:09 +0000 (20:44 +0000)]
am
fed4c5ca: Merge "Add Zopfli-recompress option to zipalign"
* commit '
fed4c5ca5aab536c891caed8be6504a58409e433':
Add Zopfli-recompress option to zipalign
Geremy Condra [Mon, 14 Jul 2014 20:44:08 +0000 (20:44 +0000)]
am
557e9c97: Merge "Add support for signed boot images."
* commit '
557e9c977fda15dd58830cb7391022e7766d78fe':
Add support for signed boot images.
Geremy Condra [Mon, 14 Jul 2014 20:44:07 +0000 (20:44 +0000)]
am
f5ca5c4b: Merge "Revert "Add support for signed boot images.""
* commit '
f5ca5c4b0d444800ddba0d8fa9138748de5c635d':
Revert "Add support for signed boot images."
Geremy Condra [Mon, 14 Jul 2014 20:44:05 +0000 (20:44 +0000)]
am
2987048f: Merge "Add support for signed boot images."
* commit '
2987048f8191ece8bc8be88a2e9632acb9806e5b':
Add support for signed boot images.
Paul Jensen [Mon, 14 Jul 2014 20:44:04 +0000 (20:44 +0000)]
am
41c124b3: Merge "Add app to handle captive portal login."
* commit '
41c124b30e49f8ccedec8fce5febcfa7971b49d0':
Add app to handle captive portal login.
Colin Cross [Mon, 14 Jul 2014 20:44:03 +0000 (20:44 +0000)]
am
fddd992d: am
5c75fa65: am
50fb938f: am
ec5563b5: Merge "build: fix host dex2oat runtime args"
* commit '
fddd992d9023d3d40d4e0e26d52dcdd49ce37e0b':
Ying Wang [Mon, 14 Jul 2014 20:44:00 +0000 (20:44 +0000)]
am
cab3ac84: am
094ab99f: am
bc3b9801: am
c4954f39: Merge "Don\'t enable LOCAL_DEX_PREOPT for apks outside system.img"
* commit '
cab3ac84c2b5e7e88e848c0bb2243051f655084a':
Ying Wang [Mon, 14 Jul 2014 20:43:58 +0000 (20:43 +0000)]
am
703709db: am
baad790d: am
f27e3fb4: am
c35cc93d: Merge "Allow symlinks to device or vendor tree in envsetup.sh."
* commit '
703709dba45405834fbe0516509f52fd13b379d3':
Brian Carlstrom [Mon, 14 Jul 2014 20:43:57 +0000 (20:43 +0000)]
am
b1c9734b: am
ef0b6e0c: am
8a749606: am
02a5b517: Merge "Make dex2oat heap size product configurable [build]"
* commit '
b1c9734b681ae985a7cab03311b7f8abe04d47ee':
Ying Wang [Mon, 14 Jul 2014 20:43:56 +0000 (20:43 +0000)]
am
26dbc3e6: am
d3b5d574: am
ce40d5f9: am
bc7501e1: Merge "More consistent use of 64-bit build variable."
* commit '
26dbc3e6e4f957e552fbf66ef71be196c86c2892':
Deepanshu Gupta [Mon, 14 Jul 2014 20:43:55 +0000 (20:43 +0000)]
am
4221bb7c: 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 '
4221bb7c4a4ddf1aab4662efdfc970e2f142014d':
Integrate build_font.py [DO NOT MERGE]
Deepanshu Gupta [Mon, 14 Jul 2014 20:43:53 +0000 (20:43 +0000)]
am
4fc3a60a: 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 '
4fc3a60ab678a66c5e5051f6889b2a4c2df46e29':
Integrate build_font.py [DO NOT MERGE]
smain@google.com [Mon, 14 Jul 2014 20:43:52 +0000 (20:43 +0000)]
am
49a723a5: am
afb83c6b: (-s ours) am
62cf72b0: am
60d43dde: (-s ours) am
97539b1c: DO NOT MERGE revise butter bar message for clarity
* commit '
49a723a514de66318de334aeff8cce1a0ac1384b':
DO NOT MERGE revise butter bar message for clarity
Ying Wang [Mon, 14 Jul 2014 20:43:51 +0000 (20:43 +0000)]
am
3abc2a39: Copy over aidl info for modules not loaded by the current build
* commit '
3abc2a392664fd08288d39513fc41182af7fefaf':
Copy over aidl info for modules not loaded by the current build
Elliott Hughes [Mon, 14 Jul 2014 20:43:46 +0000 (20:43 +0000)]
am
45a45d61: am
a97f675c: am
1b1840cb: am
af95db03: Merge "ADBS now uses stack_core code to parse traces."
* commit '
45a45d611fa96307d194bf95b8e48e870495f870':
Joe LaPenna [Mon, 14 Jul 2014 20:43:45 +0000 (20:43 +0000)]
am
6b37fd74: Merge "CW on Master: Add wifi-service to core_tiny"
* commit '
6b37fd74831b807967f876356d7710bbc446ba78':
CW on Master: Add wifi-service to core_tiny
Dan Albert [Mon, 14 Jul 2014 20:43:44 +0000 (20:43 +0000)]
Ying Wang [Mon, 14 Jul 2014 20:43:43 +0000 (20:43 +0000)]
am
55ec7e63: am
9e00b638: am
cd02c025: am
979d578e: Merge "Fix host java doc by referring to the correct classpath."
* commit '
55ec7e63d016fd4d43f9d3e3be026850c5efbd13':
Stephen Hines [Mon, 14 Jul 2014 20:32:28 +0000 (20:32 +0000)]
am
69a86f2f: am
60a0ba2b: Merge "Remove bcc from generic_no_telephony.mk."
* commit '
69a86f2f0fa0d1e97428f7b3633234e50ca0011d':
Remove bcc from generic_no_telephony.mk.
Stephen Hines [Mon, 14 Jul 2014 20:32:27 +0000 (20:32 +0000)]
am
29f93270: am
fd5e704c: Merge "Add bcc into /system/bin."
* commit '
29f932706d39799a572544b1b26e7460b16040a3':
Add bcc into /system/bin.
Stephen Hines [Mon, 14 Jul 2014 20:29:47 +0000 (20:29 +0000)]
am
60a0ba2b: Merge "Remove bcc from generic_no_telephony.mk."
* commit '
60a0ba2b345720313d1beb0421db57ece75c063c':
Remove bcc from generic_no_telephony.mk.
Stephen Hines [Mon, 14 Jul 2014 20:29:46 +0000 (20:29 +0000)]
am
fd5e704c: Merge "Add bcc into /system/bin."
* commit '
fd5e704c5683077e4c689d4a27769c034b48be7f':
Add bcc into /system/bin.
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
OSDN Git Service
