git.osdn.net Git - android-x86/build.git/log

Ian Rogers [Thu, 17 Jul 2014 13:45:46 +0000 (13:45 +0000)]

am 65256fd3: am fab98ef6: am bc30611f: Merge "Vary non-image Xmx for dex2oat on MIPS."

* commit '65256fd3e85fe3aa1aa280ca221cf0eb3efba4e0':
Vary non-image Xmx for dex2oat on MIPS.

commit | commitdiff | tree

Ying Wang [Thu, 17 Jul 2014 13:45:45 +0000 (13:45 +0000)]

am 7050d218: am 7d50394b: am e1caecfa: Merge "Fix the MIPS build."

* commit '7050d218c98c4df880df317f4ff5f229b2ae831c':
Fix the MIPS build.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

Ian Rogers [Thu, 17 Jul 2014 06:14:28 +0000 (06:14 +0000)]

Merge "Vary non-image Xmx for dex2oat on MIPS."

commit | commitdiff | tree

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

commit | commitdiff | tree

Ying Wang [Thu, 17 Jul 2014 01:12:36 +0000 (01:12 +0000)]

Merge "Fix the MIPS build."

commit | commitdiff | tree

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

commit | commitdiff | tree

David Friedman [Wed, 16 Jul 2014 13:59:57 +0000 (13:59 +0000)]

am 05173bf9: am ba6dc727: am 93848788: am 81415ada: Updated .cs page to accommodate split of NDK into 32- and 64-bit packages.

* commit '05173bf9e6591e0c065f9901355deafea5bd799d':
Updated .cs page to accommodate split of NDK into 32- and 64-bit packages.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

Tsu Chiang Chuang [Wed, 16 Jul 2014 13:47:51 +0000 (13:47 +0000)]

Merge "Include cts-junit target for cts tests."

commit | commitdiff | tree

Deepanshu Gupta [Wed, 16 Jul 2014 02:50:34 +0000 (02:50 +0000)]

am f8387bbb: (-s ours) Fix incremental builds for SDK. [DO NOT MERGE]

* commit 'f8387bbba8d800eba90859491509465983dfc715':
Fix incremental builds for SDK. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Wed, 16 Jul 2014 00:22:00 +0000 (17:22 -0700)]

Fix incremental builds for SDK. [DO NOT MERGE]

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
(cherry picked from commit 9c5564e060b019d154b07fca3513443039266145)

commit | commitdiff | tree

Deepanshu Gupta [Wed, 16 Jul 2014 00:51:57 +0000 (00:51 +0000)]

am c5aa35c4: am 9c5564e0: Fix incremental builds for SDK.

* commit 'c5aa35c4a4d0c9b089912d124e6f8c43bd47fdec':
Fix incremental builds for SDK.

commit | commitdiff | tree

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

commit | commitdiff | tree

Ed Heyl [Tue, 15 Jul 2014 17:05:54 +0000 (17:05 +0000)]

am 7b03930d: (-s ours) am f6771f63: reconcile aosp (8689b90bcfdc92c94475901935b5f6efae0c9abc) after branching. Please do not merge.

* commit '7b03930ddf1f1c72dcd9092ffb9cd7d98ce60236':
reconcile aosp (8689b90bcfdc92c94475901935b5f6efae0c9abc) after branching. Please do not merge.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

Guang Zhu [Tue, 15 Jul 2014 03:08:58 +0000 (03:08 +0000)]

am 6d1f9232: (-s ours) am 4f892ab7: DO NOT MERGE: Change build id to LMP

* commit '6d1f9232f87169f3963dff3453a5803570873151':
DO NOT MERGE: Change build id to LMP

commit | commitdiff | tree

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

commit | commitdiff | tree

Guang Zhu [Tue, 15 Jul 2014 02:34:10 +0000 (19:34 -0700)]

DO NOT MERGE: Change build id to LMP

Change-Id: Ic52925bb3f01c5d3f6560f6c9d7a8f4c58500101

commit | commitdiff | tree

Guang Zhu [Tue, 15 Jul 2014 02:31:44 +0000 (19:31 -0700)]

fix build id for master branch

Bug: 16304509
Change-Id: I2858e20701d3e705e46bd6b4f70345457b1ef90f

commit | commitdiff | tree

Ying Wang [Tue, 15 Jul 2014 01:35:54 +0000 (01:35 +0000)]

am 9d29fc2d: am 7beaea15: am 15d00664: Merge "Revert "Fix Java detection on some Linux distributions""

* commit '9d29fc2d3cd080e2ca6dc560df447d4fcfa7222b':
Revert "Fix Java detection on some Linux distributions"

commit | commitdiff | tree

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"

commit | commitdiff | tree

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"

commit | commitdiff | tree

Ying Wang [Tue, 15 Jul 2014 01:23:49 +0000 (01:23 +0000)]

Merge "Revert "Fix Java detection on some Linux distributions""

commit | commitdiff | tree

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

commit | commitdiff | tree

Daniel Rosenberg [Mon, 14 Jul 2014 23:50:35 +0000 (23:50 +0000)]

am 24e4157e: am f3bcb2d4: Merge "Added support for building verified vendor partition" into lmp-dev

* commit '24e4157e0fe8295d32f510ad7b7663bb74e9b035':
Added support for building verified vendor partition

commit | commitdiff | tree

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

commit | commitdiff | tree

Colin Cross [Mon, 14 Jul 2014 23:31:23 +0000 (23:31 +0000)]

am 8e14bac8: am f4535b25: Merge "HACK: use CPU_ABI hack only for arm64" into lmp-dev

* commit '8e14bac8be1bedd6da24330d477add1b0279c8a1':
HACK: use CPU_ABI hack only for arm64

commit | commitdiff | tree

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

commit | commitdiff | tree

Jeff Brown [Mon, 14 Jul 2014 23:08:45 +0000 (23:08 +0000)]

am 5754e2dd: am 4d7769ae: Merge "Build docs for android-support-media-protocols.jar." into lmp-dev

* commit '5754e2dd752de78b982e2214b72bd54ea6bea65c':
Build docs for android-support-media-protocols.jar.

commit | commitdiff | tree

leozwang [Mon, 14 Jul 2014 23:08:44 +0000 (23:08 +0000)]

am 24d67ba7: am 32404833: Remove bcc from generic_no_telephony.mk.

* commit '24d67ba7e52de5f26b32e22343af366b8ca69afb':
Remove bcc from generic_no_telephony.mk.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

Ying Wang [Mon, 14 Jul 2014 21:49:25 +0000 (21:49 +0000)]

am 1778c874: am 3017e13f: am c7f1389d: Merge "Fix Java detection on some Linux distributions"

* commit '1778c8746551c8f132a020f9ea4d56d13c7712d5':
Fix Java detection on some Linux distributions

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

leozwang [Mon, 14 Jul 2014 21:08:41 +0000 (21:08 +0000)]

am 2d6cf010: am 38bbc70d: Add bcc into /system/bin.

* commit '2d6cf01075120fc8bb05ecaeff9fd130aff9fa1e':
Add bcc into /system/bin.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

The Android Automerger [Mon, 14 Jul 2014 20:51:08 +0000 (20:51 +0000)]

am 96bf1f75: am 263bce3e: "LDW13B"

* commit '96bf1f759719375a0d1f8e58edfc1b2e4a502f8a':
"LDW13B"

commit | commitdiff | tree

Baligh Uddin [Mon, 14 Jul 2014 20:51:07 +0000 (20:51 +0000)]

am 948f9719: am af0aa3ca: Fix Tamil country code. ta_TN should be ta_IN

* commit '948f97197c515dced3ed2156f76dfff0af57792b':

commit | commitdiff | tree

Dan Albert [Mon, 14 Jul 2014 20:51:06 +0000 (20:51 +0000)]

am 1f65a5fb: am 79925904: am 202c962b: am 8f73aeea: am 183f90f4: am 3ffcf184: Merge "Remove -Bsymbolic from builds."

* commit '1f65a5fb119ac0c6a84ee99d3ac68dd262632504':

commit | commitdiff | tree

Ying Wang [Mon, 14 Jul 2014 20:51:05 +0000 (20:51 +0000)]

am 25deb495: am 5df55f3d: am c44f69a3: am 9e00b638: am cd02c025: am 979d578e: Merge "Fix host java doc by referring to the correct classpath."

* commit '25deb495100f014463f075374870c35944d98644':

commit | commitdiff | tree

Raph Levien [Mon, 14 Jul 2014 20:51:04 +0000 (20:51 +0000)]

am b64d7baf: am fed4c5ca: Merge "Add Zopfli-recompress option to zipalign"

* commit 'b64d7baffd9e46ebf842c28444d92a0efc32b016':

commit | commitdiff | tree

Geremy Condra [Mon, 14 Jul 2014 20:51:03 +0000 (20:51 +0000)]

am f780204d: am 557e9c97: Merge "Add support for signed boot images."

* commit 'f780204db4196fc06fed60e8ed37e6d8d99ad0ba':

commit | commitdiff | tree

Geremy Condra [Mon, 14 Jul 2014 20:51:01 +0000 (20:51 +0000)]

am 3b214245: am f5ca5c4b: Merge "Revert "Add support for signed boot images.""

* commit '3b21424533b52aabe2d50ebb8b045eb28d3cbf55':

commit | commitdiff | tree

Geremy Condra [Mon, 14 Jul 2014 20:51:00 +0000 (20:51 +0000)]

am 9236493a: am 2987048f: Merge "Add support for signed boot images."

* commit '9236493acf1724308ea9358c5cdcb1fb7d0bfc0c':

commit | commitdiff | tree

Paul Jensen [Mon, 14 Jul 2014 20:50:59 +0000 (20:50 +0000)]

am 0a0a5ca8: am 41c124b3: Merge "Add app to handle captive portal login."

* commit '0a0a5ca875768c55f52ca3ebe140ae2b06a18c58':

commit | commitdiff | tree

Colin Cross [Mon, 14 Jul 2014 20:50:58 +0000 (20:50 +0000)]

am 8b5b4329: am fddd992d: am 5c75fa65: am 50fb938f: am ec5563b5: Merge "build: fix host dex2oat runtime args"

* commit '8b5b4329763f8399ec864c388fa058dc86ec4d7d':

commit | commitdiff | tree

Ying Wang [Mon, 14 Jul 2014 20:50:57 +0000 (20:50 +0000)]

am 151abf7d: am cab3ac84: am 094ab99f: am bc3b9801: am c4954f39: Merge "Don\'t enable LOCAL_DEX_PREOPT for apks outside system.img"

* commit '151abf7d4d720f128a99ee7c6a5875b90d2b5546':

commit | commitdiff | tree

Ying Wang [Mon, 14 Jul 2014 20:50:56 +0000 (20:50 +0000)]

am 4ee14dea: am 703709db: am baad790d: am f27e3fb4: am c35cc93d: Merge "Allow symlinks to device or vendor tree in envsetup.sh."

* commit '4ee14dea6873022a17b2294c52f9d2311a22c654':

commit | commitdiff | tree

Brian Carlstrom [Mon, 14 Jul 2014 20:50:55 +0000 (20:50 +0000)]

am 1f3c5d70: am b1c9734b: am ef0b6e0c: am 8a749606: am 02a5b517: Merge "Make dex2oat heap size product configurable [build]"

* commit '1f3c5d709b4236e5fdd396e741eadd782dde3fb8':

commit | commitdiff | tree

Ying Wang [Mon, 14 Jul 2014 20:50:53 +0000 (20:50 +0000)]

am 6f2d0a09: am 26dbc3e6: am d3b5d574: am ce40d5f9: am bc7501e1: Merge "More consistent use of 64-bit build variable."

* commit '6f2d0a095488048c511c72d6e1c4176c92dd9469':

commit | commitdiff | tree

Deepanshu Gupta [Mon, 14 Jul 2014 20:50:52 +0000 (20:50 +0000)]

am 57f0cd32: (-s ours) 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 '57f0cd3242d90d86bcb1e2e549d695490dccc55a':

commit | commitdiff | tree

Deepanshu Gupta [Mon, 14 Jul 2014 20:50:51 +0000 (20:50 +0000)]

am 23e2bb53: (-s ours) 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 '23e2bb530e38c782ec918f760e3660f97441de62':

commit | commitdiff | tree

smain@google.com [Mon, 14 Jul 2014 20:50:50 +0000 (20:50 +0000)]

am 331a03d2: (-s ours) am 49a723a5: am afb83c6b: (-s ours) am 62cf72b0: am 60d43dde: (-s ours) am 97539b1c: DO NOT MERGE revise butter bar message for clarity

* commit '331a03d2a284cdfce190c9503716a56dba417708':

commit | commitdiff | tree

Ying Wang [Mon, 14 Jul 2014 20:50:49 +0000 (20:50 +0000)]

am 3823ca4c: am 3abc2a39: Copy over aidl info for modules not loaded by the current build

* commit '3823ca4c046fcf08b3fab0c6efaf23dce28ba73c':

commit | commitdiff | tree

Elliott Hughes [Mon, 14 Jul 2014 20:50:48 +0000 (20:50 +0000)]

am 80a84c6b: am 45a45d61: am a97f675c: am 1b1840cb: am af95db03: Merge "ADBS now uses stack_core code to parse traces."

* commit '80a84c6b4c2b8f9bd55e50ccf675875456a5225e':

commit | commitdiff | tree

Joe LaPenna [Mon, 14 Jul 2014 20:50:47 +0000 (20:50 +0000)]

am c6e65a72: am 6b37fd74: Merge "CW on Master: Add wifi-service to core_tiny"

* commit 'c6e65a7255c908c36e9a70dc0743a765bf5eb146':

commit | commitdiff | tree

Dan Albert [Mon, 14 Jul 2014 20:50:45 +0000 (20:50 +0000)]

am e3b719c4: am 9d8d20a1: am 8f73aeea: am 183f90f4: am 3ffcf184: Merge "Remove -Bsymbolic from builds."

* commit 'e3b719c443b68874275fc7e65f0473678d44af3b':

commit | commitdiff | tree

Ying Wang [Mon, 14 Jul 2014 20:50:44 +0000 (20:50 +0000)]

am 7f7b3125: am 55ec7e63: am 9e00b638: am cd02c025: am 979d578e: Merge "Fix host java doc by referring to the correct classpath."

* commit '7f7b31256367c0bff9a8c65907744df6b1697168':

commit | commitdiff | tree

The Android Automerger [Mon, 14 Jul 2014 20:44:15 +0000 (20:44 +0000)]

am 263bce3e: "LDW13B"

* commit '263bce3e2ab08f81945bcdce41339a84c11ff875':
"LDW13B"

commit | commitdiff | tree

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

commit | commitdiff | tree

Dan Albert [Mon, 14 Jul 2014 20:44:12 +0000 (20:44 +0000)]

am 79925904: am 202c962b: am 8f73aeea: am 183f90f4: am 3ffcf184: Merge "Remove -Bsymbolic from builds."

* commit '7992590462c9fafd35829dd99a7f1104dab483b0':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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."

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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]

commit | commitdiff | tree

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]

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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':

commit | commitdiff | tree

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

commit | commitdiff | tree

Dan Albert [Mon, 14 Jul 2014 20:43:44 +0000 (20:43 +0000)]

am 9d8d20a1: am 8f73aeea: am 183f90f4: am 3ffcf184: Merge "Remove -Bsymbolic from builds."

* commit '9d8d20a1e1f7b79af1f8f0e491740811ae5bacb2':

commit | commitdiff | tree

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':

commit | commitdiff | tree

Stephen Hines [Mon, 14 Jul 2014 20:36:19 +0000 (20:36 +0000)]

am 16caafe1: am 69a86f2f: am 60a0ba2b: Merge "Remove bcc from generic_no_telephony.mk."

* commit '16caafe17c0240ddbdfb90aab4ea22a6337dae18':
Remove bcc from generic_no_telephony.mk.

commit | commitdiff | tree

Stephen Hines [Mon, 14 Jul 2014 20:36:18 +0000 (20:36 +0000)]

am 76a93b31: am 29f93270: am fd5e704c: Merge "Add bcc into /system/bin."

* commit '76a93b31b5e32b8b542709463dce314ce326f19c':
Add bcc into /system/bin.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

Nick Kralevich [Mon, 14 Jul 2014 18:52:35 +0000 (18:52 +0000)]

am d07a58bc: am 8689b90b: am 6ff84956: Merge "Fix PIC default to be -fPIC"

* commit 'd07a58bc6df23497981a1114e37fc1d70bcca0b4':
Fix PIC default to be -fPIC

commit | commitdiff | tree

Daniel Rosenberg [Mon, 14 Jul 2014 23:32:19 +0000 (23:32 +0000)]

Merge "Added support for building verified vendor partition" into lmp-dev

commit | commitdiff | tree

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>