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

OSDN Git Service

(root) / android-x86 / build.git / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

Geremy Condra [Wed, 14 May 2014 03:23:54 +0000 (20:23 -0700)]

Reopen temporary system image to avoid stale data.

NamedTemporaryFile's aggressive caching behavior can cause an issue
where changes made by another process aren't visible even after the
fseek() below or a flush(). To avoid this, simply open the file
again and read from the fresh version.

This fixes an issue where verity metadata written by append2simg
doesn't become visible to img_from_target_files.

Change-Id: I291fb3a95d5b532218ac6205ecc9e9b4f3a36bd4

commit | commitdiff | tree

Ying Wang [Tue, 13 May 2014 17:06:01 +0000 (17:06 +0000)]

am 5c7c9887: am 03d02a26: am b082b5f1: Merge "Disable DEXPREOPT until we have multilib support"

* commit '5c7c9887f4216dbd94cc40451b3e4cc3dfd5a441':
Disable DEXPREOPT until we have multilib support

commit | commitdiff | tree

Ying Wang [Tue, 13 May 2014 16:58:47 +0000 (16:58 +0000)]

am 03d02a26: am b082b5f1: Merge "Disable DEXPREOPT until we have multilib support"

* commit '03d02a2687cbd59b8871ccbe0eeb3c2c51df063c':
Disable DEXPREOPT until we have multilib support

commit | commitdiff | tree

Ying Wang [Tue, 13 May 2014 16:54:29 +0000 (16:54 +0000)]

am b082b5f1: Merge "Disable DEXPREOPT until we have multilib support"

* commit 'b082b5f1b2d1a45ee91de186428d5e341d02c08a':
Disable DEXPREOPT until we have multilib support

commit | commitdiff | tree

Ying Wang [Tue, 13 May 2014 16:49:32 +0000 (16:49 +0000)]

Merge "Disable DEXPREOPT until we have multilib support"

commit | commitdiff | tree

Ying Wang [Tue, 13 May 2014 16:46:23 +0000 (09:46 -0700)]

Disable DEXPREOPT until we have multilib support

Bug: 14694978
Change-Id: I31d0f1c78a668435646c99e659cec46cd2f3ddf7

commit | commitdiff | tree

Ying Wang [Tue, 13 May 2014 16:43:46 +0000 (16:43 +0000)]

am 37aacb8a: am 72344a73: am 8012d8f3: Merge "Treat denver like cortex-a15."

* commit '37aacb8a31970197fb62aab3e5978e3bb4b0709b':
Treat denver like cortex-a15.

commit | commitdiff | tree

Ying Wang [Tue, 13 May 2014 16:38:47 +0000 (16:38 +0000)]

am 72344a73: am 8012d8f3: Merge "Treat denver like cortex-a15."

* commit '72344a7329ab984de716b630cb88039d9ed820a0':
Treat denver like cortex-a15.

commit | commitdiff | tree

Ying Wang [Tue, 13 May 2014 16:34:00 +0000 (16:34 +0000)]

am 8012d8f3: Merge "Treat denver like cortex-a15."

* commit '8012d8f353304ef4487545648455d34d6ffc2741':
Treat denver like cortex-a15.

commit | commitdiff | tree

Ying Wang [Tue, 13 May 2014 16:28:09 +0000 (16:28 +0000)]

Merge "Treat denver like cortex-a15."

commit | commitdiff | tree

Ying Wang [Tue, 13 May 2014 16:02:56 +0000 (09:02 -0700)]

Treat denver like cortex-a15.

See also build/core/combo/arch/arm/armv7-a-neon.mk.

Change-Id: Ie18e1f133f56a9f7da80e304052c92edad933a31

commit | commitdiff | tree

Andrew Hsieh [Tue, 13 May 2014 01:02:56 +0000 (01:02 +0000)]

am f6566fd1: am e7b99aec: am fb1f38ec: Merge "Define __USE_MINGW_ANSI_STDIO for windows build"

* commit 'f6566fd1f96275f6daec46ced8ceba25c87aedaa':
Define __USE_MINGW_ANSI_STDIO for windows build

commit | commitdiff | tree

Andrew Hsieh [Tue, 13 May 2014 00:59:28 +0000 (00:59 +0000)]

am e7b99aec: am fb1f38ec: Merge "Define __USE_MINGW_ANSI_STDIO for windows build"

* commit 'e7b99aec678426bdd19548c9f62cd3694c51702c':
Define __USE_MINGW_ANSI_STDIO for windows build

commit | commitdiff | tree

Andrew Hsieh [Tue, 13 May 2014 00:57:08 +0000 (00:57 +0000)]

am fb1f38ec: Merge "Define __USE_MINGW_ANSI_STDIO for windows build"

* commit 'fb1f38ecbacfb5dc2cc4f3f83eb814ac2aa090ca':
Define __USE_MINGW_ANSI_STDIO for windows build

commit | commitdiff | tree

Andrew Hsieh [Tue, 13 May 2014 00:53:45 +0000 (00:53 +0000)]

Merge "Define __USE_MINGW_ANSI_STDIO for windows build"

commit | commitdiff | tree

Adam Lesinski [Mon, 12 May 2014 23:31:29 +0000 (23:31 +0000)]

am 17a4a0bd: am 9bbbac75: Merge "Change aapt flag to use new name"

* commit '17a4a0bd410f6133fd9088828f27e598ec9d268b':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:31:28 +0000 (23:31 +0000)]

am b45c9108: am b80e229d: am 66f2af4e: am 6c432940: am dcdc985c: Merge "executable_prefer_symlink: add makefile for creating symlink to prefer version"

* commit 'b45c910850640ed7ffcd0f6744992ca7dc335c2c':

commit | commitdiff | tree

Geremy Condra [Mon, 12 May 2014 23:31:28 +0000 (23:31 +0000)]

am 27b95314: am c10320ee: Merge "Add verity support to `make dist`."

* commit '27b95314a0d9e49b02615a48f6805a0cb6a88af3':

commit | commitdiff | tree

David 'Digit' Turner [Mon, 12 May 2014 23:31:27 +0000 (23:31 +0000)]

am fc4e2bc5: am edc702c7: am 873782cc: am 9e3259f5: am fb67f05d: Merge changes I53b2ada9,I30794ea5

* commit 'fc4e2bc5023f26cae2b6c209c5880956d548d046':

commit | commitdiff | tree

Scott Main [Mon, 12 May 2014 23:31:26 +0000 (23:31 +0000)]

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

commit | commitdiff | tree

Michael Runge [Mon, 12 May 2014 23:31:25 +0000 (23:31 +0000)]

am 48c49a58: am 4f12fcee: Add missing quotation mark in assertion

* commit '48c49a5818feba22b531f88a102e629a4bd13d4c':

commit | commitdiff | tree

Doug Zongker [Mon, 12 May 2014 23:31:25 +0000 (23:31 +0000)]

am 93e656c7: am 91a99c28: fix ota script to generate non-block commands correctly

* commit '93e656c754b29a8f1568000a6fb27187e880fb0f':

commit | commitdiff | tree

Doug Zongker [Mon, 12 May 2014 23:31:24 +0000 (23:31 +0000)]

am 633c7ee8: am 1aebed36: Merge "assert recovery finger/thumbprints, not system"

* commit '633c7ee8804003c93f6caae38a526c98fc0f9094':

commit | commitdiff | tree

Andrew Hsieh [Mon, 12 May 2014 23:31:23 +0000 (23:31 +0000)]

am 4517d30c: am 9604c068: am a01cb054: am c581e10a: am eca0043b: Merge "Disable canonical prefixes of system headers"

* commit '4517d30cb46200334da5ade23a80a23b6d1793da':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:31:22 +0000 (23:31 +0000)]

am 4e642c1a: am 38e49504: am 96e487b2: am 98892291: am 3afc688a: Merge "javac: rename common_flags to avoid conflictions"

* commit '4e642c1aca7a7162ac95475e3d348259128fc205':

commit | commitdiff | tree

Ed Heyl [Mon, 12 May 2014 23:31:21 +0000 (23:31 +0000)]

am 6d42eda2: am 0cd5ec5b: Merge "Fix build: Revert "Add verity support to `make dist`.""

* commit '6d42eda2315dfce59e3a64eb938b85fefe3c2107':

commit | commitdiff | tree

Xavier Ducrohet [Mon, 12 May 2014 23:31:20 +0000 (23:31 +0000)]

am edd798af: am 7b967dc1: am a6a2969e: Resolved conflicts for merge of 05a7a955 to klp-modular-dev-plus-aosp

* commit 'edd798affc20203b4be16920f85c6bee05e4a0db':

commit | commitdiff | tree

Geremy Condra [Mon, 12 May 2014 23:31:20 +0000 (23:31 +0000)]

am 8fdd619c: am c921b1eb: Merge "Add verity support to `make dist`."

* commit '8fdd619c2ef5bf72ec2c573c7c7ac7feb6162aa6':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:31:19 +0000 (23:31 +0000)]

am d875bf03: am e55c2517: am af3f1a54: am d6214b31: am 0d4b3df6: Merge "Target "tests" now only builds the modules tagged as "tests""

* commit 'd875bf03094a93cc6673d0b069a7eaf81b3f8a8a':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:31:18 +0000 (23:31 +0000)]

am 2bf2db5f: am 82d64345: am 1ba08f6b: (-s ours) am 2d41656c: am f6603f75: Merge "Add tool to package up built modules."

* commit '2bf2db5f19956f618a3cb0ee1eda3ac6de87e906':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:31:17 +0000 (23:31 +0000)]

am 2665dc6b: am 151c5060: Merge "Target "tests" now only builds the modules tagged as "tests""

* commit '2665dc6b4b4afd7ffbcfea7878302837e1d31e93':

commit | commitdiff | tree

Tsu Chiang Chuang [Mon, 12 May 2014 23:31:16 +0000 (23:31 +0000)]

am 9da3a746: am 7e9d23d9: am c0d50f62: am 5bd1da1e: am 41d8760d: Merge "Bump userdata image size from 200 MB to 550 MB"

* commit '9da3a74649a40797c280a1d7a2a05e0886adca51':

commit | commitdiff | tree

Brian Carlstrom [Mon, 12 May 2014 23:31:15 +0000 (23:31 +0000)]

am 68065b37: am 0e183b2d: am 676c8f04: am 4ed19f0f: am 1e63c2d1: Merge "Add dalvik.vm.dex2oat-flags for eng build"

* commit '68065b37457de0c22cd9378297e6ff85818a19d9':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:31:15 +0000 (23:31 +0000)]

am c81c839e: am cd882627: am af93afce: am 0a61a603: am 3b15cdb8: Merge "Apply LOCAL_LDLIBS to target build rules too."

* commit 'c81c839e5bdd8a4e96db9841b026e0b45aa8daac':

commit | commitdiff | tree

Narayan Kamath [Mon, 12 May 2014 23:31:14 +0000 (23:31 +0000)]

am 1bcfb2f6: am 7b9347a7: Remove hardcoded TARGET_PREFER_32_BIT_APPS.

* commit '1bcfb2f6a307f67c33a8729de6880b4fc9d06942':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:31:13 +0000 (23:31 +0000)]

am 89d04061: am 2531f78c: Merge "Add tool to package up built modules."

* commit '89d0406159bf5563da74f234b90c5dceb03fae7e':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:31:12 +0000 (23:31 +0000)]

am d0db8b8e: am b5baabe6: Merge "Automatically export generated .pb.h files."

* commit 'd0db8b8e1ba6b956fd9ef4610764e1c9824fa525':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:31:11 +0000 (23:31 +0000)]

am a4746e97: am 80ca4a97: am ccd6223f: am ba0bb801: am a16583a0: Merge "Fix windows/mingw build."

* commit 'a4746e977e99f897eb5c0ac6dfd066b8b707f552':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:31:11 +0000 (23:31 +0000)]

am 4eb66a31: am bf145f88: am bf4cdb49: am c3b2314a: am a37550ed: Merge "Use prebuilt flex."

* commit '4eb66a3180026b189a97e8c2978f8ab4a1a09060':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:31:10 +0000 (23:31 +0000)]

am 83cc0273: am d8b39956: am 9c7393b8: am e9dd544d: am 889a93a4: Merge "add silvermont x86 architecture"

* commit '83cc02737599b7aa5d7d96318a29d9916a49ab5e':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:31:09 +0000 (23:31 +0000)]

am bd8f1c0a: am 40227dfa: am 876dca69: am 2c32044d: am b7e0bdc0: Merge "Increase system image size of generic_x86_64 to 750MB."

* commit 'bd8f1c0a90fd74e888d9548aa81ba2495054986b':

commit | commitdiff | tree

Colin Cross [Mon, 12 May 2014 23:31:03 +0000 (23:31 +0000)]

am f13e9944: am d2151e14: am 40aabbee: am 9150a90d: am 5128237a: Merge "build: set TARGET_SUPPORTS_64_BIT_APPS in 64-bit config"

* commit 'f13e99442d033a84d14f290bf76bd8ac41bb089c':

commit | commitdiff | tree

Marco Nelissen [Mon, 12 May 2014 23:31:02 +0000 (23:31 +0000)]

am 279430c9: am 5f3be2dd: Merge "Add libmediandk"

* commit '279430c90af52698718b30d27e29ee3c570c96ea':

commit | commitdiff | tree

Colin Cross [Mon, 12 May 2014 23:31:01 +0000 (23:31 +0000)]

am a9d20290: am 39fef1f4: am 6f916664: am 735628e8: am 2ff8919d: Merge changes I7e809264,I504cea21,Ibd2165e6

* commit 'a9d20290f22b334560f078373b59e9dff9d9866b':

commit | commitdiff | tree

Michael Runge [Mon, 12 May 2014 23:31:00 +0000 (23:31 +0000)]

am 1a29ea8a: am 0a2ce08f: Merge "Support block OTA + OEM partition"

* commit '1a29ea8ae81244eb75668536089cbd34db0f949c':

commit | commitdiff | tree

David 'Digit' Turner [Mon, 12 May 2014 23:30:59 +0000 (23:30 +0000)]

am 88c6a966: am 1ce02c98: Merge "envsetup.sh: Use prebuilt emulator binaries if available."

* commit '88c6a9660082f2e29ddf2364b69b02fd2b4fba3c':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:30:58 +0000 (23:30 +0000)]

am 33d5328c: am 15f6287e: am 0049c40e: am 54a570bd: am 57df0c7b: Merge "Increase system image size of generic_x86_64 to 650MB."

* commit '33d5328c554a825fb107829fc501d90b461f9ac3':

commit | commitdiff | tree

Justin Koh [Mon, 12 May 2014 23:30:57 +0000 (23:30 +0000)]

am a04ed4c6: am f0e15115: am 007f8c80: am 0e35df2a: Add ContactsProvider to core_tiny.

* commit 'a04ed4c6ba493136cc4ac3e450b3645afd9da2cc':

commit | commitdiff | tree

Colin Cross [Mon, 12 May 2014 23:30:56 +0000 (23:30 +0000)]

am 38b06024: am e8eef02c: Merge "verity: switch to C++ version of build_verity_tree"

* commit '38b06024cd371bea5dc4132c0f090f6e05e07e2f':

commit | commitdiff | tree

Dirk Dougherty [Mon, 12 May 2014 23:30:56 +0000 (23:30 +0000)]

am 28efc077: am 03257fe5: am d19aa4ba: am 611d7e14: am 379d9968: am e21bed28: Merge changes from templates-sdk to templates-sdk-dyn.

* commit '28efc077f22eeea90c522449a53634b5a65b727e':

commit | commitdiff | tree

Chad Jones [Mon, 12 May 2014 23:30:55 +0000 (23:30 +0000)]

am 3e5fee45: am 07292323: Expand PDK platform.zip auto-detect to named with vendor/pdk/PRODUCT

* commit '3e5fee453c63a2bbae9ad9403d43bca713e0b10a':

commit | commitdiff | tree

Tim Murray [Mon, 12 May 2014 23:30:54 +0000 (23:30 +0000)]

am d4487570: am f38dd880: am 09e044ea: am 6ac74e6d: am d720c5a2: Merge "Add -no-integrated-as for ARM64."

* commit 'd44875702b760b3f33c89aec38de495627d694ef':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:30:53 +0000 (23:30 +0000)]

am 9067ec11: am 40567982: am 372df5a4: am 887a52d0: am a6b8025a: Merge "Add WITH_DEXPREOPT to the list of protected global variables."

* commit '9067ec11cd9d82508c436e2723fb38f6fadbd773':

commit | commitdiff | tree

Michael Runge [Mon, 12 May 2014 23:30:52 +0000 (23:30 +0000)]

am 8544bc76: am 6e836116: Add support for verifying OEM properties.

* commit '8544bc76053806bd25957d23309a0a855f03c1c1':

commit | commitdiff | tree

Torne (Richard Coles) [Mon, 12 May 2014 23:30:52 +0000 (23:30 +0000)]

am 4d66a7f7: am a1215ab9: am 2b2a4953: am f0b5bfec: am a0267df2: Merge "Remove libpac and v8 from the 64-bit blacklist."

* commit '4d66a7f76acec2b5b1a44623fecbca0e2cc74801':

commit | commitdiff | tree

Tim Murray [Mon, 12 May 2014 23:30:51 +0000 (23:30 +0000)]

am e7dd89c8: am 93dc0578: am cf53e0e0: am 27fe9406: am 7e65b6c1: Merge "Remove tblgen and clang-tblgen from prebuilts."

* commit 'e7dd89c833f07b3edfecf98852a535437a84aaf3':

commit | commitdiff | tree

Colin Cross [Mon, 12 May 2014 23:30:50 +0000 (23:30 +0000)]

am f4a02040: am e5381d07: Merge "verity: clean up verity build dependencies"

* commit 'f4a020405a59ccb49633440065e68c1b3356073a':

commit | commitdiff | tree

Narayan Kamath [Mon, 12 May 2014 23:30:49 +0000 (23:30 +0000)]

am 7c5b5347: am 666bc685: am 7d26e97e: am 3f1d1608: am 475a3d17: Merge "Use java_home to determine jdk location."

* commit '7c5b5347849f709c12e112a312d6107c2d801d05':

commit | commitdiff | tree

Bill Yi [Mon, 12 May 2014 23:30:48 +0000 (23:30 +0000)]

am c2547639: am 5c39bb4f: am 6a275202: am 1e4adfa8: (-s ours) Merge commit \'8113e43601aac7702b9ec007e81a179826143d1e\' into HEAD

* commit 'c2547639726dc56edd1087ee88bb8ee8f01e7cb6':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:30:47 +0000 (23:30 +0000)]

am e333b45b: am 09a4e687: Add SDK product for arm64, x86_64 and mips64.

* commit 'e333b45b47c0b190c7b0daf45c98b49e03d6546d':

commit | commitdiff | tree

Andrew Hsieh [Mon, 12 May 2014 23:30:47 +0000 (23:30 +0000)]

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

commit | commitdiff | tree

Jason Parks [Mon, 12 May 2014 23:30:46 +0000 (23:30 +0000)]

am 07279937: am 13b2e19e: Use java_home to determine jdk location.

* commit '072799378b665a6668348e2472c6c61a53e6916b':

commit | commitdiff | tree

Jeff Sharkey [Mon, 12 May 2014 23:30:45 +0000 (23:30 +0000)]

am e4b8ba35: am 5ffee768: Merge "Set up rules to build oem.img"

* commit 'e4b8ba351d3a077d6ed9c0f21fd6ad6b02198d21':

commit | commitdiff | tree

Torne (Richard Coles) [Mon, 12 May 2014 23:30:44 +0000 (23:30 +0000)]

am e640ebe2: am 0b120475: am 93d0245b: am 5646d2f6: am 7250b63a: Merge "Fix PATH setup for arm64."

* commit 'e640ebe29247a8dd647016396bd9d698ace2fd28':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:30:43 +0000 (23:30 +0000)]

am 19eca03f: am 66750e63: am d4cc9dad: am 1427f872: am 676e11fe: Merge "include LGPL projects in GPL archives"

* commit '19eca03f2af2813923d855408cf0179ad07a7056':

commit | commitdiff | tree

Stephen Hines [Mon, 12 May 2014 23:30:42 +0000 (23:30 +0000)]

am a494ae9b: am 46df1818: am f0dda8d0: am 9661b09f: am 9956bb6a: Merge "Build changes necessary for LLVM 3.5 switch."

* commit 'a494ae9bafcd36329804b090909c23b2377fd4e1':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:30:42 +0000 (23:30 +0000)]

am beefce58: am 8d4562a1: resolved conflicts for merge of 0a694f4c to master

* commit 'beefce58dc9e1987143391634c09249d478bd598':

commit | commitdiff | tree

Dianne Hackborn [Mon, 12 May 2014 23:30:41 +0000 (23:30 +0000)]

am 9fe33ae8: am 6ee3c432: Add new facility to have multiple active codenames.

* commit '9fe33ae85783f8e79ffb624486efc3c6a69a3868':

commit | commitdiff | tree

Elliott Hughes [Mon, 12 May 2014 23:30:40 +0000 (23:30 +0000)]

am 6ee42ec1: am 52db54cc: am bb21bfb0: am 7cad688e: am 847fd031: Merge "Leave \'linux\' defined on x86/x86-64, like arm."

* commit '6ee42ec18cd65b7332b380a8f153d614751f15b5':

commit | commitdiff | tree

Elliott Hughes [Mon, 12 May 2014 23:30:39 +0000 (23:30 +0000)]

am d907d41b: am 1d753dda: am 439f279d: am 62911d47: am 1076c568: Merge "Leave \'linux\' defined on mips/mips64, like arm."

* commit 'd907d41b5a9dfb47a1f6d3d28cc6e3ce748f5d9b':

commit | commitdiff | tree

Torne (Richard Coles) [Mon, 12 May 2014 23:30:38 +0000 (23:30 +0000)]

am 238c44ca: am 131e93af: am 04a6aa26: am 081c1c59: am 3467048f: Merge "Remove chromium_org and webview from the 64-bit blacklist."

* commit '238c44cac5c04449a3bb0b9be9720b721acd809b':

commit | commitdiff | tree

Andrew Hsieh [Mon, 12 May 2014 23:30:37 +0000 (23:30 +0000)]

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

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:30:37 +0000 (23:30 +0000)]

am e99cb20d: am 6e048afb: am ad60c86e: am f1a3d5e8: am 871bc703: Merge "Update build system for better Clang behavior on Mac."

* commit 'e99cb20d68382ae53fecc819ff5fcb2c1e348161':

commit | commitdiff | tree

Lajos Molnar [Mon, 12 May 2014 23:30:36 +0000 (23:30 +0000)]

am 5635946f: am 9fcc2da4: Merge "Remove VideoEditor"

* commit '5635946ff81005148799e8fd96557f5beb76daa3':

commit | commitdiff | tree

Ian Rogers [Mon, 12 May 2014 23:30:35 +0000 (23:30 +0000)]

am 78d9bec5: am 2b96d6ae: resolved conflicts for merge of 77efd7b4 to master

* commit '78d9bec5cb4faf0c0f6b5f73d2b42d398ad62e01':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:30:34 +0000 (23:30 +0000)]

am ada19782: am 2290cbf8: Merge "Support to extract JNI libs from prebuilt APK"

* commit 'ada19782721bdb100555ffadc4f5c8b6500daab5':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:30:33 +0000 (23:30 +0000)]

am dc6801bd: am 141ed582: am fff7583f: am a59c2935: am 488b23d9: Merge "Update rules to install JNI libraries."

* commit 'dc6801bd18ecb8fa0660a03c88c46dc9f3871172':

commit | commitdiff | tree

Ian Rogers [Mon, 12 May 2014 23:30:32 +0000 (23:30 +0000)]

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

commit | commitdiff | tree

Ben Cheng [Mon, 12 May 2014 23:30:31 +0000 (23:30 +0000)]

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

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:30:31 +0000 (23:30 +0000)]

am 94fbbfad: am c1676c92: Merge "Update rules to install JNI libraries."

* commit '94fbbfadc95a97ddc38196594fe89cc565051f17':

commit | commitdiff | tree

Ben Cheng [Mon, 12 May 2014 23:30:30 +0000 (23:30 +0000)]

am 52db031f: am 5de2b7ff: am ea9552eb: am dc82c5a8: am 63030fe6: Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)"

* commit '52db031fa255fd25c523dce0fa13285b13845d88':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:30:29 +0000 (23:30 +0000)]

am bd1b622c: am a376dd8b: Some LOCAL_DROIDDOC_HTML_DIR has "/" in it.

* commit 'bd1b622cf9fd2374fe4454ad0d785024a3dfa2ac':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:30:28 +0000 (23:30 +0000)]

am 23571fd7: am 7cd663f0: Merge "Fix html_dir_files in droiddoc.mk"

* commit '23571fd7560355758a3db289b3bfd2b632988439':

commit | commitdiff | tree

Doug Zongker [Mon, 12 May 2014 23:30:27 +0000 (23:30 +0000)]

am 18a53d29: am 0d8179e8: fix tapas to work in more shells

* commit '18a53d297ee8bfcfd575e18f55401503ff8b50b7':

commit | commitdiff | tree

Ben Cheng [Mon, 12 May 2014 23:30:26 +0000 (23:30 +0000)]

am 8bcbc43e: am 45518095: am 455e499b: am 6350c21e: am d32bbe7d: Merge "Explicitly link libstdc++.a for static gtest executables."

* commit '8bcbc43e50e447e167a2f2ce0fe4416ffe5baa94':

commit | commitdiff | tree

Evgeniy Stepanov [Mon, 12 May 2014 23:30:25 +0000 (23:30 +0000)]

am 7b1bcd8a: am 5d8029f2: Update ASan configuration.

* commit '7b1bcd8a1d0fc8c770fb8cad5cf6a4ff258b39ae':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:30:24 +0000 (23:30 +0000)]

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

commit | commitdiff | tree

Andrew Hsieh [Mon, 12 May 2014 23:30:23 +0000 (23:30 +0000)]

am 24f62a54: am d37bf4e9: am f93c7c70: am 041d4470: am 695d8f69: Merge "Add -Wl,-maarch64linux"

* commit '24f62a54e16a2310d25796c9a3a7cfb5114e5c90':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:30:23 +0000 (23:30 +0000)]

am 5aa6416b: am c73e4615: Fix variable name.

* commit '5aa6416b600ecdd492892a18839bbb5f6da7b7f8':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:30:22 +0000 (23:30 +0000)]

am 23bf7212: am 51f0d3f5: resolved conflicts for merge of 70555a16 to master

* commit '23bf7212ce4ee925569eba7a0c9e4197981f9a29':

commit | commitdiff | tree

Narayan Kamath [Mon, 12 May 2014 23:30:21 +0000 (23:30 +0000)]

am b29c3e64: am a1f8afa9: am d954c6b9: am 60b9496c: am 22261a3f: Merge ""desktop" linux has Posix clocks."

* commit 'b29c3e64d25254c7dfd67586ff4d5881ba5fa492':

commit | commitdiff | tree

Scott Main [Mon, 12 May 2014 23:30:20 +0000 (23:30 +0000)]

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

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:30:12 +0000 (23:30 +0000)]

am 0cbe2702: am 114b46f1: Accomodate to the import syntax in build.prop.

* commit '0cbe27026d0735b9b2639f23f821d4f43cce6fe9':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:30:11 +0000 (23:30 +0000)]

am 74afb718: am 5a7ad033: Accomodate to the import syntax in build.prop.

* commit '74afb71873e22d5489d92c3e86c71228f961d70f':

commit | commitdiff | tree

Ying Wang [Mon, 12 May 2014 23:30:10 +0000 (23:30 +0000)]

am 64c092c6: am f0534c28: LOCAL_CERTIFICATE only applies to APPS.

* commit '64c092c678d5e2e2a50894b6c15e2cdfc74545b9':

commit | commitdiff | tree

Scott Main [Mon, 12 May 2014 23:30:09 +0000 (23:30 +0000)]

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

commit | commitdiff | tree

Dirk Dougherty [Mon, 12 May 2014 23:30:08 +0000 (23:30 +0000)]

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

commit | commitdiff | tree

Colin Cross [Mon, 12 May 2014 23:30:08 +0000 (23:30 +0000)]

am 8584b212: am 87cf2b5b: am 25313cd3: am 59cc3f5d: am 5b1fa1c8: Merge "build: remove LOCAL_NO_2ND_ARCH"

* commit '8584b2124a400de96f8492e9c324921047753c33':

commit | commitdiff | tree

Ben Cheng [Mon, 12 May 2014 23:30:07 +0000 (23:30 +0000)]

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

commit | commitdiff | tree

Ben Cheng [Mon, 12 May 2014 23:30:06 +0000 (23:30 +0000)]

am 6deaf208: am 2b240a7b: am c9f9decd: am 4eea070c: am f702d6d1: Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #2)"

* commit '6deaf208e5e6e809b5dd09af800e77a2ee17b655':

build

About OSDN

Find Software

Develop Software

Help

Copyright ©OSDN Corporation All rights reserved.