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 |
|
Torne (Richard Coles)
|
8a3d74631f
|
am e640ebe2: am 0b120475: am 93d0245b: am 5646d2f6: am 7250b63a: Merge "Fix PATH setup for arm64."
* commit 'e640ebe29247a8dd647016396bd9d698ace2fd28':
|
2014-05-12 23:30:44 +00:00 |
|
Ying Wang
|
0512844e62
|
am 19eca03f: am 66750e63: am d4cc9dad: am 1427f872: am 676e11fe: Merge "include LGPL projects in GPL archives"
* commit '19eca03f2af2813923d855408cf0179ad07a7056':
|
2014-05-12 23:30:43 +00:00 |
|
Stephen Hines
|
3b7e781dbc
|
am a494ae9b: am 46df1818: am f0dda8d0: am 9661b09f: am 9956bb6a: Merge "Build changes necessary for LLVM 3.5 switch."
* commit 'a494ae9bafcd36329804b090909c23b2377fd4e1':
|
2014-05-12 23:30:42 +00:00 |
|
Ying Wang
|
6922f89aef
|
am beefce58: am 8d4562a1: resolved conflicts for merge of 0a694f4c to master
* commit 'beefce58dc9e1987143391634c09249d478bd598':
|
2014-05-12 23:30:42 +00:00 |
|
Dianne Hackborn
|
e275abf73a
|
am 9fe33ae8: am 6ee3c432: Add new facility to have multiple active codenames.
* commit '9fe33ae85783f8e79ffb624486efc3c6a69a3868':
|
2014-05-12 23:30:41 +00:00 |
|
Elliott Hughes
|
b953a8115c
|
am 6ee42ec1: am 52db54cc: am bb21bfb0: am 7cad688e: am 847fd031: Merge "Leave \'linux\' defined on x86/x86-64, like arm."
* commit '6ee42ec18cd65b7332b380a8f153d614751f15b5':
|
2014-05-12 23:30:40 +00:00 |
|
Elliott Hughes
|
268a8a1aee
|
am d907d41b: am 1d753dda: am 439f279d: am 62911d47: am 1076c568: Merge "Leave \'linux\' defined on mips/mips64, like arm."
* commit 'd907d41b5a9dfb47a1f6d3d28cc6e3ce748f5d9b':
|
2014-05-12 23:30:39 +00:00 |
|
Torne (Richard Coles)
|
d06d9f3ead
|
am 238c44ca: am 131e93af: am 04a6aa26: am 081c1c59: am 3467048f: Merge "Remove chromium_org and webview from the 64-bit blacklist."
* commit '238c44cac5c04449a3bb0b9be9720b721acd809b':
|
2014-05-12 23:30:38 +00:00 |
|
Andrew Hsieh
|
3c0746894f
|
am a06aa411: am 582e5ecb: am aabe27cc: am 9754735f: am db55f602: Merge "Switch to new host prebuilt x86_64-linux-glibc2.11-4.6"
* commit 'a06aa411f6db97ff4f2198721dc9f06df566e1d1':
|
2014-05-12 23:30:37 +00:00 |
|
Ying Wang
|
15fbc385f6
|
am e99cb20d: am 6e048afb: am ad60c86e: am f1a3d5e8: am 871bc703: Merge "Update build system for better Clang behavior on Mac."
* commit 'e99cb20d68382ae53fecc819ff5fcb2c1e348161':
|
2014-05-12 23:30:37 +00:00 |
|
Lajos Molnar
|
dbe7ae5e3b
|
am 5635946f: am 9fcc2da4: Merge "Remove VideoEditor"
* commit '5635946ff81005148799e8fd96557f5beb76daa3':
|
2014-05-12 23:30:36 +00:00 |
|
Ian Rogers
|
7a26db3013
|
am 78d9bec5: am 2b96d6ae: resolved conflicts for merge of 77efd7b4 to master
* commit '78d9bec5cb4faf0c0f6b5f73d2b42d398ad62e01':
|
2014-05-12 23:30:35 +00:00 |
|
Ying Wang
|
48738a4dac
|
am ada19782: am 2290cbf8: Merge "Support to extract JNI libs from prebuilt APK"
* commit 'ada19782721bdb100555ffadc4f5c8b6500daab5':
|
2014-05-12 23:30:34 +00:00 |
|
Ying Wang
|
8708dd16d0
|
am dc6801bd: am 141ed582: am fff7583f: am a59c2935: am 488b23d9: Merge "Update rules to install JNI libraries."
* commit 'dc6801bd18ecb8fa0660a03c88c46dc9f3871172':
|
2014-05-12 23:30:33 +00:00 |
|
Ian Rogers
|
3aa770052c
|
am b6b9add0: am 621cefb8: am 29eb3d09: am 9b3fb2c3: am 67c20928: Merge "For 64-bit, use 32-bit DEXPREOPT if zygote64 isn\'t enabled."
* commit 'b6b9add0619e95f9c50963d7d1e8b7c1a946ea7b':
|
2014-05-12 23:30:32 +00:00 |
|
Ben Cheng
|
7f4081f57a
|
am 9e5d7acf: am 1d9c67dd: am 1bb663a8: am 26232093: am 5c72b726: Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)""
* commit '9e5d7acff86382f64ce653f242cdb1ead14a7e76':
|
2014-05-12 23:30:31 +00:00 |
|
Ying Wang
|
952a846924
|
am 94fbbfad: am c1676c92: Merge "Update rules to install JNI libraries."
* commit '94fbbfadc95a97ddc38196594fe89cc565051f17':
|
2014-05-12 23:30:31 +00:00 |
|
Ben Cheng
|
4eda4a6bd1
|
am 52db031f: am 5de2b7ff: am ea9552eb: am dc82c5a8: am 63030fe6: Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)"
* commit '52db031fa255fd25c523dce0fa13285b13845d88':
|
2014-05-12 23:30:30 +00:00 |
|
Ying Wang
|
4356b32db6
|
am bd1b622c: am a376dd8b: Some LOCAL_DROIDDOC_HTML_DIR has "/" in it.
* commit 'bd1b622cf9fd2374fe4454ad0d785024a3dfa2ac':
|
2014-05-12 23:30:29 +00:00 |
|
Ying Wang
|
2c17494336
|
am 23571fd7: am 7cd663f0: Merge "Fix html_dir_files in droiddoc.mk"
* commit '23571fd7560355758a3db289b3bfd2b632988439':
|
2014-05-12 23:30:28 +00:00 |
|
Doug Zongker
|
671a93f3c2
|
am 18a53d29: am 0d8179e8: fix tapas to work in more shells
* commit '18a53d297ee8bfcfd575e18f55401503ff8b50b7':
|
2014-05-12 23:30:27 +00:00 |
|
Ben Cheng
|
395f7621b1
|
am 8bcbc43e: am 45518095: am 455e499b: am 6350c21e: am d32bbe7d: Merge "Explicitly link libstdc++.a for static gtest executables."
* commit '8bcbc43e50e447e167a2f2ce0fe4416ffe5baa94':
|
2014-05-12 23:30:26 +00:00 |
|
Evgeniy Stepanov
|
560a04cbc4
|
am 7b1bcd8a: am 5d8029f2: Update ASan configuration.
* commit '7b1bcd8a1d0fc8c770fb8cad5cf6a4ff258b39ae':
|
2014-05-12 23:30:25 +00:00 |
|
Ying Wang
|
dcc5ae17b3
|
am 7e44b38b: am 105ed03c: am 25e75aba: am 6e3bbf64: am 0ac89b45: Merge "Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build."
* commit '7e44b38b119e65391e2e5825780c31f7e1efc8cf':
|
2014-05-12 23:30:24 +00:00 |
|
Andrew Hsieh
|
b67d474505
|
am 24f62a54: am d37bf4e9: am f93c7c70: am 041d4470: am 695d8f69: Merge "Add -Wl,-maarch64linux"
* commit '24f62a54e16a2310d25796c9a3a7cfb5114e5c90':
|
2014-05-12 23:30:23 +00:00 |
|
Ying Wang
|
d9957cd189
|
am 5aa6416b: am c73e4615: Fix variable name.
* commit '5aa6416b600ecdd492892a18839bbb5f6da7b7f8':
|
2014-05-12 23:30:23 +00:00 |
|
Ying Wang
|
ade42628a3
|
am 23bf7212: am 51f0d3f5: resolved conflicts for merge of 70555a16 to master
* commit '23bf7212ce4ee925569eba7a0c9e4197981f9a29':
|
2014-05-12 23:30:22 +00:00 |
|
Narayan Kamath
|
ad238b9e08
|
am b29c3e64: am a1f8afa9: am d954c6b9: am 60b9496c: am 22261a3f: Merge ""desktop" linux has Posix clocks."
* commit 'b29c3e64d25254c7dfd67586ff4d5881ba5fa492':
|
2014-05-12 23:30:21 +00:00 |
|
Scott Main
|
5b22817c05
|
am 30426855: am e65e2134: am 554bb7b6: am cdbb1241: am 01adbdcb: am 613b251b: Merge "remove the animated scroll adjustment for sticky nav. Instead adjust the scroll position based on changes to the hashtag." into klp-docs
* commit '304268550504fa3bccb860b9430d7b4ea30b1d1e':
|
2014-05-12 23:30:20 +00:00 |
|
Ying Wang
|
f14f466277
|
am 0cbe2702: am 114b46f1: Accomodate to the import syntax in build.prop.
* commit '0cbe27026d0735b9b2639f23f821d4f43cce6fe9':
|
2014-05-12 23:30:12 +00:00 |
|
Ying Wang
|
edf968d6f7
|
am 74afb718: am 5a7ad033: Accomodate to the import syntax in build.prop.
* commit '74afb71873e22d5489d92c3e86c71228f961d70f':
|
2014-05-12 23:30:11 +00:00 |
|
Ying Wang
|
5b510f35ce
|
am 64c092c6: am f0534c28: LOCAL_CERTIFICATE only applies to APPS.
* commit '64c092c678d5e2e2a50894b6c15e2cdfc74545b9':
|
2014-05-12 23:30:10 +00:00 |
|
Scott Main
|
07683ca785
|
am 0d117b3b: am 74e22573: am 78f264f7: am 3829f621: am b1a6d644: am 1670cca5: Merge "make the sticky bar aware of search result visiblity. Fixes a bug that caused the sidenav to overlap search results." into klp-docs
* commit '0d117b3bd237f65d03fdfdb83d3b1da70ef4a1bc':
|
2014-05-12 23:30:09 +00:00 |
|
Dirk Dougherty
|
40110deb83
|
am 5c9e8e26: am 7b1fe64c: am 7de9c942: am 45094b5d: am d0c6f0a1: am 318fb971: Optimize truncation for card text, add About to sticky nav colors, minor adjustment to templates.
* commit '5c9e8e2673af31e1c36ae7d92ab6de00a039c8f2':
|
2014-05-12 23:30:08 +00:00 |
|
Colin Cross
|
bf738a34da
|
am 8584b212: am 87cf2b5b: am 25313cd3: am 59cc3f5d: am 5b1fa1c8: Merge "build: remove LOCAL_NO_2ND_ARCH"
* commit '8584b2124a400de96f8492e9c324921047753c33':
|
2014-05-12 23:30:08 +00:00 |
|
Ben Cheng
|
fdba6e65e0
|
am c8801755: am bdcb4bcd: am e921da9d: am bddce34c: am 065c4180: Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #2)""
* commit 'c8801755dbf95fc17c57c6cc2477685c9afba567':
|
2014-05-12 23:30:07 +00:00 |
|
Ben Cheng
|
5c6063b342
|
am 6deaf208: am 2b240a7b: am c9f9decd: am 4eea070c: am f702d6d1: Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #2)"
* commit '6deaf208e5e6e809b5dd09af800e77a2ee17b655':
|
2014-05-12 23:30:06 +00:00 |
|
Ben Cheng
|
162e2380db
|
am 6ac86235: am 19b7c4d5: am e4d787bf: am 7e793040: am eec11d97: Merge "Decouple platform compiler and NDK library versioning."
* commit '6ac86235ca47ae510cf527fbe8804d78d83cab06':
|
2014-05-12 23:30:05 +00:00 |
|
Colin Cross
|
d542438c32
|
am f79b0ad8: am 6c277fac: am 14203772: am 3221717f: am a355ae12: Merge changes I2c10e41f,I5b5e23f1,If3f5a81c,I07520b75
* commit 'f79b0ad84bbd9646ee3462924c0884ea31686d17':
|
2014-05-12 23:30:04 +00:00 |
|
Scott Main
|
23548ecf58
|
am db7b5d17: am e737ca9a: am 7bb8315c: am 4786cc3b: am de22e6fb: am 20cf2a91: update sticky nav to sync with sidenav and build the breadcrumbs dynamically
* commit 'db7b5d171147ef0a79b9903caddd16641d3452fa':
|
2014-05-12 23:30:03 +00:00 |
|
Colin Cross
|
95378d2f40
|
am f2e35a0b: am bde0c5a4: am fa75d63c: am dbf1f804: am 80f7dbd4: Merge "gdbclient: use 64-bit suffix for all library symbols"
* commit 'f2e35a0b03f9803da0925865f7b8984f693dfc85':
|
2014-05-12 23:30:02 +00:00 |
|
Ben Cheng
|
5abc0fdb0a
|
am 172b29b9: am 335c76d8: am c77ffa89: am add6c037: am 13eaf184: Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build.""
* commit '172b29b94defce47e8794378894c1710728a71ce':
|
2014-05-12 23:30:02 +00:00 |
|