Andrew Hsieh
|
e7b99aec67
|
am fb1f38ec: Merge "Define __USE_MINGW_ANSI_STDIO for windows build"
* commit 'fb1f38ecbacfb5dc2cc4f3f83eb814ac2aa090ca':
Define __USE_MINGW_ANSI_STDIO for windows build
|
2014-05-13 00:57:08 +00:00 |
|
Andrew Hsieh
|
fb1f38ecba
|
Merge "Define __USE_MINGW_ANSI_STDIO for windows build"
|
2014-05-13 00:53:45 +00:00 |
|
Adam Lesinski
|
404d21450a
|
am 17a4a0bd: am 9bbbac75: Merge "Change aapt flag to use new name"
* commit '17a4a0bd410f6133fd9088828f27e598ec9d268b':
|
2014-05-12 23:31:29 +00:00 |
|
Ying Wang
|
48ea32b2bf
|
am b45c9108: am b80e229d: am 66f2af4e: am 6c432940: am dcdc985c: Merge "executable_prefer_symlink: add makefile for creating symlink to prefer version"
* commit 'b45c910850640ed7ffcd0f6744992ca7dc335c2c':
|
2014-05-12 23:31:28 +00:00 |
|
Geremy Condra
|
f3c1b1460a
|
am 27b95314: am c10320ee: Merge "Add verity support to make dist."
* commit '27b95314a0d9e49b02615a48f6805a0cb6a88af3':
|
2014-05-12 23:31:28 +00:00 |
|
David 'Digit' Turner
|
8ccc5ba19b
|
am fc4e2bc5: am edc702c7: am 873782cc: am 9e3259f5: am fb67f05d: Merge changes I53b2ada9,I30794ea5
* commit 'fc4e2bc5023f26cae2b6c209c5880956d548d046':
|
2014-05-12 23:31:27 +00:00 |
|
Scott Main
|
5de9137377
|
am a4cb2d99: am bd58064a: am 17b3567b: am e4af3b35: am 18ba007b: am 7a6ab434: update wear header template to support sticky nav. moved the search and menu markup for the header into a method call. also update the styles and script so that when a page does not belong t
* commit 'a4cb2d99a341af8027c8194aadcfd5c1dd7b0933':
|
2014-05-12 23:31:26 +00:00 |
|
Michael Runge
|
2bccbe93c4
|
am 48c49a58: am 4f12fcee: Add missing quotation mark in assertion
* commit '48c49a5818feba22b531f88a102e629a4bd13d4c':
|
2014-05-12 23:31:25 +00:00 |
|
Doug Zongker
|
8fd66d8715
|
am 93e656c7: am 91a99c28: fix ota script to generate non-block commands correctly
* commit '93e656c754b29a8f1568000a6fb27187e880fb0f':
|
2014-05-12 23:31:25 +00:00 |
|
Doug Zongker
|
756d630846
|
am 633c7ee8: am 1aebed36: Merge "assert recovery finger/thumbprints, not system"
* commit '633c7ee8804003c93f6caae38a526c98fc0f9094':
|
2014-05-12 23:31:24 +00:00 |
|
Andrew Hsieh
|
4298097e3f
|
am 4517d30c: am 9604c068: am a01cb054: am c581e10a: am eca0043b: Merge "Disable canonical prefixes of system headers"
* commit '4517d30cb46200334da5ade23a80a23b6d1793da':
|
2014-05-12 23:31:23 +00:00 |
|
Ying Wang
|
07704af345
|
am 4e642c1a: am 38e49504: am 96e487b2: am 98892291: am 3afc688a: Merge "javac: rename common_flags to avoid conflictions"
* commit '4e642c1aca7a7162ac95475e3d348259128fc205':
|
2014-05-12 23:31:22 +00:00 |
|
Ed Heyl
|
05984102db
|
am 6d42eda2: am 0cd5ec5b: Merge "Fix build: Revert "Add verity support to make dist.""
* commit '6d42eda2315dfce59e3a64eb938b85fefe3c2107':
|
2014-05-12 23:31:21 +00:00 |
|
Xavier Ducrohet
|
21ac7be215
|
am edd798af: am 7b967dc1: am a6a2969e: Resolved conflicts for merge of 05a7a955 to klp-modular-dev-plus-aosp
* commit 'edd798affc20203b4be16920f85c6bee05e4a0db':
|
2014-05-12 23:31:20 +00:00 |
|
Geremy Condra
|
fa229c6f93
|
am 8fdd619c: am c921b1eb: Merge "Add verity support to make dist."
* commit '8fdd619c2ef5bf72ec2c573c7c7ac7feb6162aa6':
|
2014-05-12 23:31:20 +00:00 |
|
Ying Wang
|
8e980f166e
|
am d875bf03: am e55c2517: am af3f1a54: am d6214b31: am 0d4b3df6: Merge "Target "tests" now only builds the modules tagged as "tests""
* commit 'd875bf03094a93cc6673d0b069a7eaf81b3f8a8a':
|
2014-05-12 23:31:19 +00:00 |
|
Ying Wang
|
f462f1bba7
|
am 2bf2db5f: am 82d64345: am 1ba08f6b: (-s ours) am 2d41656c: am f6603f75: Merge "Add tool to package up built modules."
* commit '2bf2db5f19956f618a3cb0ee1eda3ac6de87e906':
|
2014-05-12 23:31:18 +00:00 |
|
Ying Wang
|
e9b6bee9a5
|
am 2665dc6b: am 151c5060: Merge "Target "tests" now only builds the modules tagged as "tests""
* commit '2665dc6b4b4afd7ffbcfea7878302837e1d31e93':
|
2014-05-12 23:31:17 +00:00 |
|
Tsu Chiang Chuang
|
ce78a9a01c
|
am 9da3a746: am 7e9d23d9: am c0d50f62: am 5bd1da1e: am 41d8760d: Merge "Bump userdata image size from 200 MB to 550 MB"
* commit '9da3a74649a40797c280a1d7a2a05e0886adca51':
|
2014-05-12 23:31:16 +00:00 |
|
Brian Carlstrom
|
595f09b65a
|
am 68065b37: am 0e183b2d: am 676c8f04: am 4ed19f0f: am 1e63c2d1: Merge "Add dalvik.vm.dex2oat-flags for eng build"
* commit '68065b37457de0c22cd9378297e6ff85818a19d9':
|
2014-05-12 23:31:15 +00:00 |
|
Ying Wang
|
dc4171cea0
|
am c81c839e: am cd882627: am af93afce: am 0a61a603: am 3b15cdb8: Merge "Apply LOCAL_LDLIBS to target build rules too."
* commit 'c81c839e5bdd8a4e96db9841b026e0b45aa8daac':
|
2014-05-12 23:31:15 +00:00 |
|
Narayan Kamath
|
7e49c32578
|
am 1bcfb2f6: am 7b9347a7: Remove hardcoded TARGET_PREFER_32_BIT_APPS.
* commit '1bcfb2f6a307f67c33a8729de6880b4fc9d06942':
|
2014-05-12 23:31:14 +00:00 |
|
Ying Wang
|
37355c3b67
|
am 89d04061: am 2531f78c: Merge "Add tool to package up built modules."
* commit '89d0406159bf5563da74f234b90c5dceb03fae7e':
|
2014-05-12 23:31:13 +00:00 |
|
Ying Wang
|
d1e3aec496
|
am d0db8b8e: am b5baabe6: Merge "Automatically export generated .pb.h files."
* commit 'd0db8b8e1ba6b956fd9ef4610764e1c9824fa525':
|
2014-05-12 23:31:12 +00:00 |
|
Ying Wang
|
4e815cbb09
|
am a4746e97: am 80ca4a97: am ccd6223f: am ba0bb801: am a16583a0: Merge "Fix windows/mingw build."
* commit 'a4746e977e99f897eb5c0ac6dfd066b8b707f552':
|
2014-05-12 23:31:11 +00:00 |
|
Ying Wang
|
b6a8bb6946
|
am 4eb66a31: am bf145f88: am bf4cdb49: am c3b2314a: am a37550ed: Merge "Use prebuilt flex."
* commit '4eb66a3180026b189a97e8c2978f8ab4a1a09060':
|
2014-05-12 23:31:11 +00:00 |
|
Ying Wang
|
4d80e2b9b2
|
am 83cc0273: am d8b39956: am 9c7393b8: am e9dd544d: am 889a93a4: Merge "add silvermont x86 architecture"
* commit '83cc02737599b7aa5d7d96318a29d9916a49ab5e':
|
2014-05-12 23:31:10 +00:00 |
|
Ying Wang
|
7d56a69f9b
|
am bd8f1c0a: am 40227dfa: am 876dca69: am 2c32044d: am b7e0bdc0: Merge "Increase system image size of generic_x86_64 to 750MB."
* commit 'bd8f1c0a90fd74e888d9548aa81ba2495054986b':
|
2014-05-12 23:31:09 +00:00 |
|
Colin Cross
|
951b9179a0
|
am f13e9944: am d2151e14: am 40aabbee: am 9150a90d: am 5128237a: Merge "build: set TARGET_SUPPORTS_64_BIT_APPS in 64-bit config"
* commit 'f13e99442d033a84d14f290bf76bd8ac41bb089c':
|
2014-05-12 23:31:03 +00:00 |
|
Marco Nelissen
|
bb243b3fa1
|
am 279430c9: am 5f3be2dd: Merge "Add libmediandk"
* commit '279430c90af52698718b30d27e29ee3c570c96ea':
|
2014-05-12 23:31:02 +00:00 |
|
Colin Cross
|
cd722fe9db
|
am a9d20290: am 39fef1f4: am 6f916664: am 735628e8: am 2ff8919d: Merge changes I7e809264,I504cea21,Ibd2165e6
* commit 'a9d20290f22b334560f078373b59e9dff9d9866b':
|
2014-05-12 23:31:01 +00:00 |
|
Michael Runge
|
02ba307fe6
|
am 1a29ea8a: am 0a2ce08f: Merge "Support block OTA + OEM partition"
* commit '1a29ea8ae81244eb75668536089cbd34db0f949c':
|
2014-05-12 23:31:00 +00:00 |
|
David 'Digit' Turner
|
f59a93b412
|
am 88c6a966: am 1ce02c98: Merge "envsetup.sh: Use prebuilt emulator binaries if available."
* commit '88c6a9660082f2e29ddf2364b69b02fd2b4fba3c':
|
2014-05-12 23:30:59 +00:00 |
|
Ying Wang
|
bcff8ba627
|
am 33d5328c: am 15f6287e: am 0049c40e: am 54a570bd: am 57df0c7b: Merge "Increase system image size of generic_x86_64 to 650MB."
* commit '33d5328c554a825fb107829fc501d90b461f9ac3':
|
2014-05-12 23:30:58 +00:00 |
|
Justin Koh
|
944460abf7
|
am a04ed4c6: am f0e15115: am 007f8c80: am 0e35df2a: Add ContactsProvider to core_tiny.
* commit 'a04ed4c6ba493136cc4ac3e450b3645afd9da2cc':
|
2014-05-12 23:30:57 +00:00 |
|
Colin Cross
|
72ce56a2d8
|
am 38b06024: am e8eef02c: Merge "verity: switch to C++ version of build_verity_tree"
* commit '38b06024cd371bea5dc4132c0f090f6e05e07e2f':
|
2014-05-12 23:30:56 +00:00 |
|
Dirk Dougherty
|
a1c7ee5803
|
am 28efc077: am 03257fe5: am d19aa4ba: am 611d7e14: am 379d9968: am e21bed28: Merge changes from templates-sdk to templates-sdk-dyn.
* commit '28efc077f22eeea90c522449a53634b5a65b727e':
|
2014-05-12 23:30:56 +00:00 |
|
Chad Jones
|
b8bcc71640
|
am 3e5fee45: am 07292323: Expand PDK platform.zip auto-detect to named with vendor/pdk/PRODUCT
* commit '3e5fee453c63a2bbae9ad9403d43bca713e0b10a':
|
2014-05-12 23:30:55 +00:00 |
|
Tim Murray
|
069bb66030
|
am d4487570: am f38dd880: am 09e044ea: am 6ac74e6d: am d720c5a2: Merge "Add -no-integrated-as for ARM64."
* commit 'd44875702b760b3f33c89aec38de495627d694ef':
|
2014-05-12 23:30:54 +00:00 |
|
Ying Wang
|
d2592e9508
|
am 9067ec11: am 40567982: am 372df5a4: am 887a52d0: am a6b8025a: Merge "Add WITH_DEXPREOPT to the list of protected global variables."
* commit '9067ec11cd9d82508c436e2723fb38f6fadbd773':
|
2014-05-12 23:30:53 +00:00 |
|
Michael Runge
|
7a6d8c8ea0
|
am 8544bc76: am 6e836116: Add support for verifying OEM properties.
* commit '8544bc76053806bd25957d23309a0a855f03c1c1':
|
2014-05-12 23:30:52 +00:00 |
|
Torne (Richard Coles)
|
a575ac7753
|
am 4d66a7f7: am a1215ab9: am 2b2a4953: am f0b5bfec: am a0267df2: Merge "Remove libpac and v8 from the 64-bit blacklist."
* commit '4d66a7f76acec2b5b1a44623fecbca0e2cc74801':
|
2014-05-12 23:30:52 +00:00 |
|
Tim Murray
|
dc746a8c8a
|
am e7dd89c8: am 93dc0578: am cf53e0e0: am 27fe9406: am 7e65b6c1: Merge "Remove tblgen and clang-tblgen from prebuilts."
* commit 'e7dd89c833f07b3edfecf98852a535437a84aaf3':
|
2014-05-12 23:30:51 +00:00 |
|
Colin Cross
|
1e2e8a9517
|
am f4a02040: am e5381d07: Merge "verity: clean up verity build dependencies"
* commit 'f4a020405a59ccb49633440065e68c1b3356073a':
|
2014-05-12 23:30:50 +00:00 |
|
Narayan Kamath
|
bd11acc62d
|
am 7c5b5347: am 666bc685: am 7d26e97e: am 3f1d1608: am 475a3d17: Merge "Use java_home to determine jdk location."
* commit '7c5b5347849f709c12e112a312d6107c2d801d05':
|
2014-05-12 23:30:49 +00:00 |
|
Bill Yi
|
d1975e7915
|
am c2547639: am 5c39bb4f: am 6a275202: am 1e4adfa8: (-s ours) Merge commit \'8113e43601aac7702b9ec007e81a179826143d1e\' into HEAD
* commit 'c2547639726dc56edd1087ee88bb8ee8f01e7cb6':
|
2014-05-12 23:30:48 +00:00 |
|
Ying Wang
|
aaa3f18309
|
am e333b45b: am 09a4e687: Add SDK product for arm64, x86_64 and mips64.
* commit 'e333b45b47c0b190c7b0daf45c98b49e03d6546d':
|
2014-05-12 23:30:47 +00:00 |
|
Andrew Hsieh
|
30c41f22ba
|
am 1a023497: am 293ccf9a: am d815dbd1: am f14ba5b9: am 8afa2555: Merge "Rename my_ndk_version_root to my_ndk_sysroot; and _include and _lib"
* commit '1a023497022f9f51b7e9d1e56d74618fe8e0f07e':
|
2014-05-12 23:30:47 +00:00 |
|
Jason Parks
|
746fdef58a
|
am 07279937: am 13b2e19e: Use java_home to determine jdk location.
* commit '072799378b665a6668348e2472c6c61a53e6916b':
|
2014-05-12 23:30:46 +00:00 |
|
Jeff Sharkey
|
e0156ab836
|
am e4b8ba35: am 5ffee768: Merge "Set up rules to build oem.img"
* commit 'e4b8ba351d3a077d6ed9c0f21fd6ad6b02198d21':
|
2014-05-12 23:30:45 +00:00 |
|