OSDN Git Service

android-x86/build.git
10 years agoam 66b6b628: am 0c2acdc0: am 023c2865: am 97542cc9: Merge "Don\'t blacklist all of...
Glenn Kasten [Tue, 18 Mar 2014 22:01:52 +0000 (22:01 +0000)]
am 66b6b628: am 0c2acdc0: am 023c2865: am 97542cc9: Merge "Don\'t blacklist all of frameworks/av for 64-bit"

* commit '66b6b62822d60b2d5b590df1263b61bf119f37ae':
  Don't blacklist all of frameworks/av for 64-bit

10 years agoam 0c2acdc0: am 023c2865: am 97542cc9: Merge "Don\'t blacklist all of frameworks...
Glenn Kasten [Tue, 18 Mar 2014 21:56:43 +0000 (21:56 +0000)]
am 0c2acdc0: am 023c2865: am 97542cc9: Merge "Don\'t blacklist all of frameworks/av for 64-bit"

* commit '0c2acdc042022447a21fc43b06fc518212817f6b':
  Don't blacklist all of frameworks/av for 64-bit

10 years agoam 023c2865: am 97542cc9: Merge "Don\'t blacklist all of frameworks/av for 64-bit"
Glenn Kasten [Tue, 18 Mar 2014 21:53:41 +0000 (21:53 +0000)]
am 023c2865: am 97542cc9: Merge "Don\'t blacklist all of frameworks/av for 64-bit"

* commit '023c286563ce09b2d42c81a38d4dc17ee011ac9e':
  Don't blacklist all of frameworks/av for 64-bit

10 years agoam 97542cc9: Merge "Don\'t blacklist all of frameworks/av for 64-bit"
Glenn Kasten [Tue, 18 Mar 2014 21:48:36 +0000 (14:48 -0700)]
am 97542cc9: Merge "Don\'t blacklist all of frameworks/av for 64-bit"

* commit '97542cc9bf4b2e5fad1576fa7262fa531bcf3fe4':
  Don't blacklist all of frameworks/av for 64-bit

10 years agoMerge "Don't blacklist all of frameworks/av for 64-bit"
Glenn Kasten [Tue, 18 Mar 2014 21:45:12 +0000 (21:45 +0000)]
Merge "Don't blacklist all of frameworks/av for 64-bit"

10 years agoam 6099a84f: am 2521d0d2: am 5a4183f3: am 267afcde: Merge "HACK: disable emulator...
Greg Hackmann [Tue, 18 Mar 2014 20:53:00 +0000 (20:53 +0000)]
am 6099a84f: am 2521d0d2: am 5a4183f3: am 267afcde: Merge "HACK: disable emulator on x86_64"

* commit '6099a84f14804d741f0574c0c211b507d2ae21ae':
  HACK: disable emulator on x86_64

10 years agoam 1bd53e59: am 59683508: am 5462f7f9: am 255ea2bd: Merge "Remove unused LOCAL_ASSET_...
Ying Wang [Tue, 18 Mar 2014 20:52:55 +0000 (20:52 +0000)]
am 1bd53e59: am 59683508: am 5462f7f9: am 255ea2bd: Merge "Remove unused LOCAL_ASSET_FILES."

* commit '1bd53e59558f7973a038f4b0d5c78a7fdfa45f91':
  Remove unused LOCAL_ASSET_FILES.

10 years agoam 2521d0d2: am 5a4183f3: am 267afcde: Merge "HACK: disable emulator on x86_64"
Greg Hackmann [Tue, 18 Mar 2014 19:33:35 +0000 (19:33 +0000)]
am 2521d0d2: am 5a4183f3: am 267afcde: Merge "HACK: disable emulator on x86_64"

* commit '2521d0d23a151c8689125dc119d80fa86a52dbfb':
  HACK: disable emulator on x86_64

10 years agoam 5a4183f3: am 267afcde: Merge "HACK: disable emulator on x86_64"
Greg Hackmann [Tue, 18 Mar 2014 19:28:33 +0000 (19:28 +0000)]
am 5a4183f3: am 267afcde: Merge "HACK: disable emulator on x86_64"

* commit '5a4183f3916f2666edfa4a6f1d0f4f7da07cd52e':
  HACK: disable emulator on x86_64

10 years agoam 267afcde: Merge "HACK: disable emulator on x86_64"
Greg Hackmann [Tue, 18 Mar 2014 19:25:45 +0000 (12:25 -0700)]
am 267afcde: Merge "HACK: disable emulator on x86_64"

* commit '267afcdefe3a6da9b72a9c70d238abb00be69949':
  HACK: disable emulator on x86_64

10 years agoMerge "HACK: disable emulator on x86_64"
Greg Hackmann [Tue, 18 Mar 2014 19:21:48 +0000 (19:21 +0000)]
Merge "HACK: disable emulator on x86_64"

10 years agoDon't blacklist all of frameworks/av for 64-bit
Glenn Kasten [Wed, 12 Mar 2014 16:00:15 +0000 (09:00 -0700)]
Don't blacklist all of frameworks/av for 64-bit

Change-Id: Ic2db99b1b577e3355c50982af5068bce32edf4ba

10 years agoam 59683508: am 5462f7f9: am 255ea2bd: Merge "Remove unused LOCAL_ASSET_FILES."
Ying Wang [Tue, 18 Mar 2014 18:50:17 +0000 (18:50 +0000)]
am 59683508: am 5462f7f9: am 255ea2bd: Merge "Remove unused LOCAL_ASSET_FILES."

* commit '5968350855ea7534aa13cbafa3c8004918407130':
  Remove unused LOCAL_ASSET_FILES.

10 years agoam 5462f7f9: am 255ea2bd: Merge "Remove unused LOCAL_ASSET_FILES."
Ying Wang [Tue, 18 Mar 2014 18:44:32 +0000 (18:44 +0000)]
am 5462f7f9: am 255ea2bd: Merge "Remove unused LOCAL_ASSET_FILES."

* commit '5462f7f953915bd345a58b17977e79e6405b56d0':
  Remove unused LOCAL_ASSET_FILES.

10 years agoam 255ea2bd: Merge "Remove unused LOCAL_ASSET_FILES."
Ying Wang [Tue, 18 Mar 2014 18:38:25 +0000 (11:38 -0700)]
am 255ea2bd: Merge "Remove unused LOCAL_ASSET_FILES."

* commit '255ea2bdc45673b7d08809f4495f060b00006c6e':
  Remove unused LOCAL_ASSET_FILES.

10 years agoMerge "Remove unused LOCAL_ASSET_FILES."
Ying Wang [Tue, 18 Mar 2014 18:32:05 +0000 (18:32 +0000)]
Merge "Remove unused LOCAL_ASSET_FILES."

10 years agoRemove unused LOCAL_ASSET_FILES.
Ying Wang [Tue, 18 Mar 2014 18:31:09 +0000 (11:31 -0700)]
Remove unused LOCAL_ASSET_FILES.

Change-Id: Ie0b2b2e30a158b779016767fb868f3e03b2f828a

10 years agoHACK: disable emulator on x86_64
Greg Hackmann [Tue, 18 Mar 2014 18:11:07 +0000 (11:11 -0700)]
HACK: disable emulator on x86_64

The build system and qemu disagree about where the x86_64 kernel should
live; disable the emulator until that's resolved

Change-Id: Ia7a2745ee8f3f4211ce39f8d851d5d860acbf62b
Signed-off-by: Greg Hackmann <ghackmann@google.com>
10 years agoam 7c3e03cf: am ce1ea340: am 7250ac63: am bb79f9d2: am b7b49711: add some css to...
Scott Main [Tue, 18 Mar 2014 12:46:55 +0000 (12:46 +0000)]
am 7c3e03cf: am ce1ea340: am 7250ac63: am bb79f9d2: am b7b49711: add some css to support android wear sub-site

* commit '7c3e03cfe869b19b9fc566d65a980a6761229d35':
  add some css to support android wear sub-site

10 years agoam 17630b82: am 8bc7a283: am 45b9be37: am 264d4001: (-s ours) am 7503e736: 4.4.3...
Dianne Hackborn [Tue, 18 Mar 2014 12:46:54 +0000 (12:46 +0000)]
am 17630b82: am 8bc7a283: am 45b9be37: am 264d4001: (-s ours) am 7503e736: 4.4.3 is MR2, version boogaloo!

* commit '17630b82b9281997f558b3bc572629931fc6fbfc':
  4.4.3 is MR2, version boogaloo!

10 years agoam ce1ea340: am 7250ac63: am bb79f9d2: am b7b49711: add some css to support android...
Scott Main [Tue, 18 Mar 2014 12:44:09 +0000 (12:44 +0000)]
am ce1ea340: am 7250ac63: am bb79f9d2: am b7b49711: add some css to support android wear sub-site

* commit 'ce1ea340102492e34e6baff5f44f488e6dfb3b9d':
  add some css to support android wear sub-site

10 years agoam 8bc7a283: am 45b9be37: am 264d4001: (-s ours) am 7503e736: 4.4.3 is MR2, version...
Dianne Hackborn [Tue, 18 Mar 2014 12:44:08 +0000 (12:44 +0000)]
am 8bc7a283: am 45b9be37: am 264d4001: (-s ours) am 7503e736: 4.4.3 is MR2, version boogaloo!

* commit '8bc7a28330598059b17c936c6387e0daf23bec6d':
  4.4.3 is MR2, version boogaloo!

10 years agoam 7250ac63: am bb79f9d2: am b7b49711: add some css to support android wear sub-site
Scott Main [Tue, 18 Mar 2014 12:41:07 +0000 (12:41 +0000)]
am 7250ac63: am bb79f9d2: am b7b49711: add some css to support android wear sub-site

* commit '7250ac63e5a3f7d04f055ccb53b5a1f32f4c11e1':
  add some css to support android wear sub-site

10 years agoam 45b9be37: am 264d4001: (-s ours) am 7503e736: 4.4.3 is MR2, version boogaloo!
Dianne Hackborn [Tue, 18 Mar 2014 12:41:06 +0000 (12:41 +0000)]
am 45b9be37: am 264d4001: (-s ours) am 7503e736: 4.4.3 is MR2, version boogaloo!

* commit '45b9be37a5ad7d92fbd8c089386d297412f765f0':
  4.4.3 is MR2, version boogaloo!

10 years agoam bb79f9d2: am b7b49711: add some css to support android wear sub-site
Scott Main [Tue, 18 Mar 2014 12:37:22 +0000 (12:37 +0000)]
am bb79f9d2: am b7b49711: add some css to support android wear sub-site

* commit 'bb79f9d2a52c7f1e20bd74e5d80b2df4119cec82':
  add some css to support android wear sub-site

10 years agoam 264d4001: (-s ours) am 7503e736: 4.4.3 is MR2, version boogaloo!
Dianne Hackborn [Tue, 18 Mar 2014 12:37:22 +0000 (12:37 +0000)]
am 264d4001: (-s ours) am 7503e736: 4.4.3 is MR2, version boogaloo!

* commit '264d4001e7d01e302f93803d161f778fb200e346':
  4.4.3 is MR2, version boogaloo!

10 years agoam b7b49711: add some css to support android wear sub-site
Scott Main [Tue, 18 Mar 2014 12:35:42 +0000 (12:35 +0000)]
am b7b49711: add some css to support android wear sub-site

* commit 'b7b497115fb19d17a3e5de20646a5eac759c0095':
  add some css to support android wear sub-site

10 years agoadd some css to support android wear sub-site
Scott Main [Tue, 18 Mar 2014 12:29:15 +0000 (05:29 -0700)]
add some css to support android wear sub-site

Change-Id: Ibce2c596219fb86f433075c88a0af9d0cc1007b3

10 years agoam 314b5c98: am 66a4ef8f: am d14f3cc7: am 5384c187: Merge "Add LOCAL_NDK_STL_VARIANT...
Andrew Hsieh [Tue, 18 Mar 2014 00:15:28 +0000 (00:15 +0000)]
am 314b5c98: am 66a4ef8f: am d14f3cc7: am 5384c187: Merge "Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared"

* commit '314b5c98cbd68d11e7484b5e35a1bea466cde66b':
  Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared

10 years agoMerge "move audio policy service to a separate library"
Eric Laurent [Tue, 18 Mar 2014 00:14:24 +0000 (00:14 +0000)]
Merge "move audio policy service to a separate library"

10 years agoam 66a4ef8f: am d14f3cc7: am 5384c187: Merge "Add LOCAL_NDK_STL_VARIANT:=c++_static...
Andrew Hsieh [Tue, 18 Mar 2014 00:11:27 +0000 (00:11 +0000)]
am 66a4ef8f: am d14f3cc7: am 5384c187: Merge "Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared"

* commit '66a4ef8f754b73f3e45d5b87a09fcc3655cda7f3':
  Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared

10 years agoam d14f3cc7: am 5384c187: Merge "Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared"
Andrew Hsieh [Tue, 18 Mar 2014 00:09:13 +0000 (00:09 +0000)]
am d14f3cc7: am 5384c187: Merge "Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared"

* commit 'd14f3cc7bc9983ea5ba1c2d952d2b5f51935f42c':
  Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared

10 years agoam 5384c187: Merge "Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared"
Andrew Hsieh [Tue, 18 Mar 2014 00:07:44 +0000 (17:07 -0700)]
am 5384c187: Merge "Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared"

* commit '5384c187871b1ede992d7de2b4299be45d0e0030':
  Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared

10 years agoMerge "Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared"
Andrew Hsieh [Tue, 18 Mar 2014 00:04:25 +0000 (00:04 +0000)]
Merge "Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared"

10 years agoAdd LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared
Andrew Hsieh [Tue, 4 Mar 2014 09:11:52 +0000 (17:11 +0800)]
Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared

Add llvm libc++ static and shared libraries

Change-Id: I92af9b6ab21cbf8ea82e014a4c11aeb5455920f9

10 years agoam df0c90d0: am ce418783: am a660d06e: am 1cda15d3: Merge "Don\'t modify LOCAL_STRIP_...
Ying Wang [Sun, 16 Mar 2014 20:16:45 +0000 (20:16 +0000)]
am df0c90d0: am ce418783: am a660d06e: am 1cda15d3: Merge "Don\'t modify LOCAL_STRIP_MODULE"

* commit 'df0c90d0e544c9353df0135a23643aea043a9f4b':
  Don't modify LOCAL_STRIP_MODULE

10 years agoam ce418783: am a660d06e: am 1cda15d3: Merge "Don\'t modify LOCAL_STRIP_MODULE"
Ying Wang [Sun, 16 Mar 2014 20:13:41 +0000 (20:13 +0000)]
am ce418783: am a660d06e: am 1cda15d3: Merge "Don\'t modify LOCAL_STRIP_MODULE"

* commit 'ce4187832a7825efccae13b69ed5499608a66a13':
  Don't modify LOCAL_STRIP_MODULE

10 years agoam a660d06e: am 1cda15d3: Merge "Don\'t modify LOCAL_STRIP_MODULE"
Ying Wang [Sun, 16 Mar 2014 20:08:31 +0000 (20:08 +0000)]
am a660d06e: am 1cda15d3: Merge "Don\'t modify LOCAL_STRIP_MODULE"

* commit 'a660d06eeb9a53bc8d88fc2e559d461dc6a77d67':
  Don't modify LOCAL_STRIP_MODULE

10 years agoam 1cda15d3: Merge "Don\'t modify LOCAL_STRIP_MODULE"
Ying Wang [Sun, 16 Mar 2014 20:04:59 +0000 (13:04 -0700)]
am 1cda15d3: Merge "Don\'t modify LOCAL_STRIP_MODULE"

* commit '1cda15d3234a502ba7332b56a7bbecca228731cf':
  Don't modify LOCAL_STRIP_MODULE

10 years agoMerge "Don't modify LOCAL_STRIP_MODULE"
Ying Wang [Sun, 16 Mar 2014 20:02:56 +0000 (20:02 +0000)]
Merge "Don't modify LOCAL_STRIP_MODULE"

10 years agoDon't modify LOCAL_STRIP_MODULE
Ying Wang [Sun, 16 Mar 2014 19:43:49 +0000 (12:43 -0700)]
Don't modify LOCAL_STRIP_MODULE

LOCAL_STRIP_MODULE will be reused in multilib build.

Change-Id: I3512efb360c7eaafad02859723ab4368778effed

10 years agoam c48da22b: am 8213b719: am 6e92ade0: am db24577b: Merge "Work in progress to enable...
Colin Cross [Sun, 16 Mar 2014 00:06:17 +0000 (00:06 +0000)]
am c48da22b: am 8213b719: am 6e92ade0: am db24577b: Merge "Work in progress to enable build system support for Clang."

* commit 'c48da22b6d0f7be0b9ce9f1d448fc524e692e86c':
  Work in progress to enable build system support for Clang.

10 years agoam 8213b719: am 6e92ade0: am db24577b: Merge "Work in progress to enable build system...
Colin Cross [Sun, 16 Mar 2014 00:02:44 +0000 (00:02 +0000)]
am 8213b719: am 6e92ade0: am db24577b: Merge "Work in progress to enable build system support for Clang."

* commit '8213b719c8e5e4f757a4898213eb624622c11526':
  Work in progress to enable build system support for Clang.

10 years agoam 6e92ade0: am db24577b: Merge "Work in progress to enable build system support...
Colin Cross [Sat, 15 Mar 2014 23:59:32 +0000 (23:59 +0000)]
am 6e92ade0: am db24577b: Merge "Work in progress to enable build system support for Clang."

* commit '6e92ade0a6cd8aea8f074fdc44f375ef2f1d50b7':
  Work in progress to enable build system support for Clang.

10 years agoam db24577b: Merge "Work in progress to enable build system support for Clang."
Colin Cross [Sat, 15 Mar 2014 23:56:40 +0000 (16:56 -0700)]
am db24577b: Merge "Work in progress to enable build system support for Clang."

* commit 'db24577bbd0ccc60be19791290d367e2efb5583e':
  Work in progress to enable build system support for Clang.

10 years agoMerge "Work in progress to enable build system support for Clang."
Colin Cross [Sat, 15 Mar 2014 23:54:03 +0000 (23:54 +0000)]
Merge "Work in progress to enable build system support for Clang."

10 years agoam 70dff286: am 228f8afc: am de8edc8a: am 933e8940: Merge "Fix HOST_TOOLCHAIN_PREFIX"
Andrew Hsieh [Fri, 14 Mar 2014 17:13:11 +0000 (17:13 +0000)]
am 70dff286: am 228f8afc: am de8edc8a: am 933e8940: Merge "Fix HOST_TOOLCHAIN_PREFIX"

* commit '70dff2866fd7a22a7248a80fd888d167c0f7636a':
  Fix HOST_TOOLCHAIN_PREFIX

10 years agoWork in progress to enable build system support for Clang.
Tim Murray [Fri, 7 Mar 2014 21:18:44 +0000 (13:18 -0800)]
Work in progress to enable build system support for Clang.

Change-Id: I278b48bcd976afcbde8d86261da9b9b9efc9002c

10 years agoam 228f8afc: am de8edc8a: am 933e8940: Merge "Fix HOST_TOOLCHAIN_PREFIX"
Andrew Hsieh [Fri, 14 Mar 2014 00:31:45 +0000 (00:31 +0000)]
am 228f8afc: am de8edc8a: am 933e8940: Merge "Fix HOST_TOOLCHAIN_PREFIX"

* commit '228f8afc4d7f95314fe76335e819d176b331e041':
  Fix HOST_TOOLCHAIN_PREFIX

10 years agoam de8edc8a: am 933e8940: Merge "Fix HOST_TOOLCHAIN_PREFIX"
Andrew Hsieh [Fri, 14 Mar 2014 00:26:55 +0000 (00:26 +0000)]
am de8edc8a: am 933e8940: Merge "Fix HOST_TOOLCHAIN_PREFIX"

* commit 'de8edc8a35e5a53c6f1f8e5db099c28691319585':
  Fix HOST_TOOLCHAIN_PREFIX

10 years agoam 933e8940: Merge "Fix HOST_TOOLCHAIN_PREFIX"
Andrew Hsieh [Fri, 14 Mar 2014 00:23:37 +0000 (17:23 -0700)]
am 933e8940: Merge "Fix HOST_TOOLCHAIN_PREFIX"

* commit '933e8940d00745413ae1e9d0e76714feecf9086a':
  Fix HOST_TOOLCHAIN_PREFIX

10 years agoMerge "Fix HOST_TOOLCHAIN_PREFIX"
Andrew Hsieh [Fri, 14 Mar 2014 00:19:18 +0000 (00:19 +0000)]
Merge "Fix HOST_TOOLCHAIN_PREFIX"

10 years agoMerge "Fix another build break."
Hui Shu [Thu, 13 Mar 2014 23:35:42 +0000 (23:35 +0000)]
Merge "Fix another build break."

10 years agoFix another build break.
Hui Shu [Thu, 13 Mar 2014 23:21:08 +0000 (16:21 -0700)]
Fix another build break.

The doclava build does not need to depend on the intermedidate
removed.txt. It depends on public_api.txt. Removed.txt is generated
along with public_api.txt by doclava.

BUG: b/11293324
Change-Id: Ia5ea675bbfb15b81ce6ae81cf34c608e83676ca1

10 years agoam 2c852c33: am f262d87f: am 237f5414: am cc8d6dab: Merge "Revert "Remove external...
Narayan Kamath [Thu, 13 Mar 2014 23:11:49 +0000 (23:11 +0000)]
am 2c852c33: am f262d87f: am 237f5414: am cc8d6dab: Merge "Revert "Remove external/chromium from the 64 bit blacklist.""

* commit '2c852c3399d86ae2f25fe4205d8e4bd4a3ce971f':
  Revert "Remove external/chromium from the 64 bit blacklist."

10 years agoFix the build break.
Hui Shu [Thu, 13 Mar 2014 22:38:29 +0000 (15:38 -0700)]
Fix the build break.

BUG: b/11293324
Should find the removed.txt under frameworks/base/api/

Change-Id: Icd937cb8c1a7f23dba35c440045cea54e2a8242e

10 years agoMerge "Add removed.txt for doclava api consistency check"
Hui Shu [Thu, 13 Mar 2014 22:11:22 +0000 (22:11 +0000)]
Merge "Add removed.txt for doclava api consistency check"

10 years agoam e00d0e7c: am f6869e25: am 70916972: am 25249624: Merge "Remove external/chromium...
Narayan Kamath [Thu, 13 Mar 2014 21:20:36 +0000 (21:20 +0000)]
am e00d0e7c: am f6869e25: am 70916972: am 25249624: Merge "Remove external/chromium from the 64 bit blacklist."

* commit 'e00d0e7c6a5b63489faa3e8e9de6285b11f7b8e9':
  Remove external/chromium from the 64 bit blacklist.

10 years agoam f262d87f: am 237f5414: am cc8d6dab: Merge "Revert "Remove external/chromium from...
Narayan Kamath [Thu, 13 Mar 2014 09:40:11 +0000 (09:40 +0000)]
am f262d87f: am 237f5414: am cc8d6dab: Merge "Revert "Remove external/chromium from the 64 bit blacklist.""

* commit 'f262d87f0163222fbdb0cb99cd21f4646d2c6f4f':
  Revert "Remove external/chromium from the 64 bit blacklist."

10 years agoam 237f5414: am cc8d6dab: Merge "Revert "Remove external/chromium from the 64 bit...
Narayan Kamath [Thu, 13 Mar 2014 09:33:58 +0000 (09:33 +0000)]
am 237f5414: am cc8d6dab: Merge "Revert "Remove external/chromium from the 64 bit blacklist.""

* commit '237f5414ebf38e1386307679947641f72865fc38':
  Revert "Remove external/chromium from the 64 bit blacklist."

10 years agoam cc8d6dab: Merge "Revert "Remove external/chromium from the 64 bit blacklist.""
Narayan Kamath [Thu, 13 Mar 2014 09:31:33 +0000 (02:31 -0700)]
am cc8d6dab: Merge "Revert "Remove external/chromium from the 64 bit blacklist.""

* commit 'cc8d6dab9a3ae140ed99d3f3373e72b54811f210':
  Revert "Remove external/chromium from the 64 bit blacklist."

10 years agoMerge "Revert "Remove external/chromium from the 64 bit blacklist.""
Narayan Kamath [Thu, 13 Mar 2014 09:29:52 +0000 (09:29 +0000)]
Merge "Revert "Remove external/chromium from the 64 bit blacklist.""

10 years agoRevert "Remove external/chromium from the 64 bit blacklist."
Narayan Kamath [Thu, 13 Mar 2014 09:29:22 +0000 (09:29 +0000)]
Revert "Remove external/chromium from the 64 bit blacklist."

This reverts commit 27bf51144af3513605cff421beb39a556599eb42.

Change-Id: Ic7e4fff8f87342a248172c2fc0d1358b4db1c25c

10 years agoam f6869e25: am 70916972: am 25249624: Merge "Remove external/chromium from the 64...
Narayan Kamath [Thu, 13 Mar 2014 09:28:33 +0000 (09:28 +0000)]
am f6869e25: am 70916972: am 25249624: Merge "Remove external/chromium from the 64 bit blacklist."

* commit 'f6869e25c9117d20a9a1f315d5784068e4d7ea99':
  Remove external/chromium from the 64 bit blacklist.

10 years agoam 70916972: am 25249624: Merge "Remove external/chromium from the 64 bit blacklist."
Narayan Kamath [Thu, 13 Mar 2014 09:18:00 +0000 (09:18 +0000)]
am 70916972: am 25249624: Merge "Remove external/chromium from the 64 bit blacklist."

* commit '709169725a34836b3f388526aee714f070f20103':
  Remove external/chromium from the 64 bit blacklist.

10 years agoam 25249624: Merge "Remove external/chromium from the 64 bit blacklist."
Narayan Kamath [Thu, 13 Mar 2014 09:08:35 +0000 (02:08 -0700)]
am 25249624: Merge "Remove external/chromium from the 64 bit blacklist."

* commit '252496247f31ee06d8c948886fd2f3a36ccd021e':
  Remove external/chromium from the 64 bit blacklist.

10 years agoMerge "Remove external/chromium from the 64 bit blacklist."
Narayan Kamath [Thu, 13 Mar 2014 09:05:30 +0000 (09:05 +0000)]
Merge "Remove external/chromium from the 64 bit blacklist."

10 years agoam abfea0ac: am 7ba6258a: am d842e6d6: am c62d6f76: Merge "Add TARGET_2ND_ARCH to...
Dmitriy Ivanov [Wed, 12 Mar 2014 22:57:47 +0000 (22:57 +0000)]
am abfea0ac: am 7ba6258a: am d842e6d6: am c62d6f76: Merge "Add TARGET_2ND_ARCH to dumpvar"

* commit 'abfea0ac92964024996dc487028f1b4896e1bdf0':
  Add TARGET_2ND_ARCH to dumpvar

10 years agoam 7ba6258a: am d842e6d6: am c62d6f76: Merge "Add TARGET_2ND_ARCH to dumpvar"
Dmitriy Ivanov [Wed, 12 Mar 2014 18:53:04 +0000 (18:53 +0000)]
am 7ba6258a: am d842e6d6: am c62d6f76: Merge "Add TARGET_2ND_ARCH to dumpvar"

* commit '7ba6258a7b4206c97da2dce6719625cf4cbd5b96':
  Add TARGET_2ND_ARCH to dumpvar

10 years agoam d842e6d6: am c62d6f76: Merge "Add TARGET_2ND_ARCH to dumpvar"
Dmitriy Ivanov [Wed, 12 Mar 2014 18:49:19 +0000 (18:49 +0000)]
am d842e6d6: am c62d6f76: Merge "Add TARGET_2ND_ARCH to dumpvar"

* commit 'd842e6d6c35fc7b0320e2e9ceb69caa71daf040a':
  Add TARGET_2ND_ARCH to dumpvar

10 years agoam c62d6f76: Merge "Add TARGET_2ND_ARCH to dumpvar"
Dmitriy Ivanov [Wed, 12 Mar 2014 18:46:05 +0000 (11:46 -0700)]
am c62d6f76: Merge "Add TARGET_2ND_ARCH to dumpvar"

* commit 'c62d6f7622f567ba9a0acf54a80d118f85e741b4':
  Add TARGET_2ND_ARCH to dumpvar

10 years agoMerge "Add TARGET_2ND_ARCH to dumpvar"
Dmitriy Ivanov [Wed, 12 Mar 2014 18:40:42 +0000 (18:40 +0000)]
Merge "Add TARGET_2ND_ARCH to dumpvar"

10 years agoAdd TARGET_2ND_ARCH to dumpvar
Dmitriy Ivanov [Wed, 12 Mar 2014 18:13:41 +0000 (11:13 -0700)]
Add TARGET_2ND_ARCH to dumpvar

Change-Id: Ida87a61cceb55b7ebc28735b4688a03a10c01096

10 years agoRemove external/chromium from the 64 bit blacklist.
Narayan Kamath [Wed, 12 Mar 2014 14:42:07 +0000 (14:42 +0000)]
Remove external/chromium from the 64 bit blacklist.

This isn't the same as chromium_org (which is used by the
webview). This is a 3 year old snapshot of the net stack which
compiles under 64 bit. It's currently used on aosp master by
libstagefright_chromium_http.

This project can be removed if the changes that remove the
chromium dependency are cherry-picked to aosp/master.

Change-Id: I5d0f9ed03ea9842b47d980d77ea32bc7a3f6998f

10 years agoFix HOST_TOOLCHAIN_PREFIX
Andrew Hsieh [Wed, 12 Mar 2014 11:27:59 +0000 (19:27 +0800)]
Fix HOST_TOOLCHAIN_PREFIX

Previously HOST_TOOLCHAIN_PREFIX can't accept toolchain in arch-os-*-gcc
format.  Fix it so we can try out new host toolchain, eg.

  HOST_TOOLCHAIN_PREFIX=prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.6/bin/x86_64-linux- make

Change-Id: Ic1092593036c41d5471e788654fb4e0991dd7e40

10 years agoMerge "Use analyzer at new location: prebuilts/misc/{linux-x86,darwin-x86}/analyzer"
Andrew Hsieh [Wed, 12 Mar 2014 01:49:34 +0000 (01:49 +0000)]
Merge "Use analyzer at new location: prebuilts/misc/{linux-x86,darwin-x86}/analyzer"

10 years agoam 7503e736: 4.4.3 is MR2, version boogaloo!
Dianne Hackborn [Tue, 11 Mar 2014 23:22:38 +0000 (23:22 +0000)]
am 7503e736: 4.4.3 is MR2, version boogaloo!

* commit '7503e736ebb0161a23ff0ee39a307cd436ea8afc':
  4.4.3 is MR2, version boogaloo!

10 years ago4.4.3 is MR2, version boogaloo!
Dianne Hackborn [Tue, 11 Mar 2014 21:54:09 +0000 (14:54 -0700)]
4.4.3 is MR2, version boogaloo!

Change-Id: I1a06850393247183fa3db9fbd3fbc8774f181a26

10 years agoRemove "screenshot"
Andy McFadden [Tue, 11 Mar 2014 20:51:12 +0000 (13:51 -0700)]
Remove "screenshot"

Remove the old "screenshot" utility, which has been replaced
by "screencap".

Change-Id: I5bad1fdad308339e4a16ce92f2a65e2437b1be65

10 years agoam f91a014f: am 0a196075: am 446f00c9: am ce156811: Merge "Split WITHOUT_CLANG to...
Ying Wang [Tue, 11 Mar 2014 02:15:11 +0000 (02:15 +0000)]
am f91a014f: am 0a196075: am 446f00c9: am ce156811: Merge "Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG"

* commit 'f91a014f6f2c176f6e1f99cb3bb90d707e0be31c':
  Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG

10 years agoam 0a196075: am 446f00c9: am ce156811: Merge "Split WITHOUT_CLANG to WITHOUT_HOST_CLA...
Ying Wang [Tue, 11 Mar 2014 02:11:29 +0000 (02:11 +0000)]
am 0a196075: am 446f00c9: am ce156811: Merge "Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG"

* commit '0a196075eeddef89a5cc8b679adde7c0791031bf':
  Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG

10 years agoam 446f00c9: am ce156811: Merge "Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOU...
Ying Wang [Tue, 11 Mar 2014 02:08:45 +0000 (02:08 +0000)]
am 446f00c9: am ce156811: Merge "Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG"

* commit '446f00c9e1a8ef2b119617ab63c15a6aa40c733b':
  Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG

10 years agoam ce156811: Merge "Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG"
Ying Wang [Tue, 11 Mar 2014 02:05:27 +0000 (19:05 -0700)]
am ce156811: Merge "Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG"

* commit 'ce156811797d7594b712120c5d969e329d70b1e3':
  Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG

10 years agoMerge "Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG"
Ying Wang [Tue, 11 Mar 2014 02:03:07 +0000 (02:03 +0000)]
Merge "Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG"

10 years agoSplit WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG
Ying Wang [Tue, 11 Mar 2014 01:23:08 +0000 (18:23 -0700)]
Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG

Still keep WITHOUT_CLANG, which enables both.

Bug: 13402154
Change-Id: I32cb668223997719875751bf3d64f592d6086830

10 years agoam d5cd41fe: am 95739176: am 21060b30: am 775d15e0: Merge "Define __STDC_CONSTANT_MAC...
Ian Rogers [Tue, 11 Mar 2014 00:37:50 +0000 (00:37 +0000)]
am d5cd41fe: am 95739176: am 21060b30: am 775d15e0: Merge "Define __STDC_CONSTANT_MACROS globally to work around host build differences."

* commit 'd5cd41fe6d9d140e84703e87cec1f83660e568e3':
  Define __STDC_CONSTANT_MACROS globally to work around host build differences.

10 years agoam 95739176: am 21060b30: am 775d15e0: Merge "Define __STDC_CONSTANT_MACROS globally...
Ian Rogers [Tue, 11 Mar 2014 00:04:52 +0000 (00:04 +0000)]
am 95739176: am 21060b30: am 775d15e0: Merge "Define __STDC_CONSTANT_MACROS globally to work around host build differences."

* commit '95739176994c3b28fc7fdd3e677de500cdd66b8c':
  Define __STDC_CONSTANT_MACROS globally to work around host build differences.

10 years agoam 21060b30: am 775d15e0: Merge "Define __STDC_CONSTANT_MACROS globally to work aroun...
Ian Rogers [Tue, 11 Mar 2014 00:01:57 +0000 (00:01 +0000)]
am 21060b30: am 775d15e0: Merge "Define __STDC_CONSTANT_MACROS globally to work around host build differences."

* commit '21060b30993b975084ea7a7c35a6df23cf0e5ea7':
  Define __STDC_CONSTANT_MACROS globally to work around host build differences.

10 years agoam 775d15e0: Merge "Define __STDC_CONSTANT_MACROS globally to work around host build...
Ian Rogers [Mon, 10 Mar 2014 23:59:07 +0000 (16:59 -0700)]
am 775d15e0: Merge "Define __STDC_CONSTANT_MACROS globally to work around host build differences."

* commit '775d15e001d48d72a1b76982b1b5faa1eb37158f':
  Define __STDC_CONSTANT_MACROS globally to work around host build differences.

10 years agoMerge "Define __STDC_CONSTANT_MACROS globally to work around host build differences."
Ian Rogers [Mon, 10 Mar 2014 23:55:32 +0000 (23:55 +0000)]
Merge "Define __STDC_CONSTANT_MACROS globally to work around host build differences."

10 years agoDefine __STDC_CONSTANT_MACROS globally to work around host build differences.
Ian Rogers [Mon, 10 Mar 2014 23:49:41 +0000 (16:49 -0700)]
Define __STDC_CONSTANT_MACROS globally to work around host build differences.

Change-Id: I945128b3087b28f62467c7123b759e3514027574

10 years agoam 17536801: am e25c0b25: am bc39fd5c: am f1e697be: Merge "Revert "Define __STDC_LIMI...
Ian Rogers [Mon, 10 Mar 2014 23:42:20 +0000 (23:42 +0000)]
am 17536801: am e25c0b25: am bc39fd5c: am f1e697be: Merge "Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences.""

* commit '17536801ea179360da3ba2886dfc48dda392d28a':
  Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences."

10 years agoam e25c0b25: am bc39fd5c: am f1e697be: Merge "Revert "Define __STDC_LIMIT_MACROS...
Ian Rogers [Mon, 10 Mar 2014 23:39:12 +0000 (23:39 +0000)]
am e25c0b25: am bc39fd5c: am f1e697be: Merge "Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences.""

* commit 'e25c0b259917b31bfe642b6e4aa08de06068db7a':
  Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences."

10 years agoam bc39fd5c: am f1e697be: Merge "Revert "Define __STDC_LIMIT_MACROS globally to work...
Ian Rogers [Mon, 10 Mar 2014 23:37:13 +0000 (23:37 +0000)]
am bc39fd5c: am f1e697be: Merge "Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences.""

* commit 'bc39fd5cab47388797ee7638920766e91fe0b100':
  Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences."

10 years agoam f1e697be: Merge "Revert "Define __STDC_LIMIT_MACROS globally to work around host...
Ian Rogers [Mon, 10 Mar 2014 23:33:44 +0000 (16:33 -0700)]
am f1e697be: Merge "Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences.""

* commit 'f1e697be5e433818071a817af0b673cba8e87795':
  Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences."

10 years agoMerge "Revert "Define __STDC_LIMIT_MACROS globally to work around host build differen...
Ian Rogers [Mon, 10 Mar 2014 23:29:25 +0000 (23:29 +0000)]
Merge "Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences.""

10 years agoRevert "Define __STDC_LIMIT_MACROS globally to work around host build differences."
Ian Rogers [Mon, 10 Mar 2014 23:27:01 +0000 (23:27 +0000)]
Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences."

This reverts commit 668427c941bd88cacdf24d0562e6b68eb93038a1.

Change-Id: I3694aad84e7499e4c6839db0bd06acf5166e4802

10 years agoam 4d16757b: am 848361f9: am a520bfbe: am 4783dc7a: Merge "Define __STDC_LIMIT_MACROS...
Ian Rogers [Mon, 10 Mar 2014 22:58:18 +0000 (22:58 +0000)]
am 4d16757b: am 848361f9: am a520bfbe: am 4783dc7a: Merge "Define __STDC_LIMIT_MACROS globally to work around host build differences."

* commit '4d16757b201003cd25b0b27a717b1bc7c32a6dd8':
  Define __STDC_LIMIT_MACROS globally to work around host build differences.

10 years agoam 848361f9: am a520bfbe: am 4783dc7a: Merge "Define __STDC_LIMIT_MACROS globally...
Ian Rogers [Mon, 10 Mar 2014 22:54:53 +0000 (22:54 +0000)]
am 848361f9: am a520bfbe: am 4783dc7a: Merge "Define __STDC_LIMIT_MACROS globally to work around host build differences."

* commit '848361f97e84aa5ef6a05fc38126734fb5728e84':
  Define __STDC_LIMIT_MACROS globally to work around host build differences.

10 years agoam a520bfbe: am 4783dc7a: Merge "Define __STDC_LIMIT_MACROS globally to work around...
Ian Rogers [Mon, 10 Mar 2014 22:51:08 +0000 (22:51 +0000)]
am a520bfbe: am 4783dc7a: Merge "Define __STDC_LIMIT_MACROS globally to work around host build differences."

* commit 'a520bfbeb65b307da42abb079911311096fef20c':
  Define __STDC_LIMIT_MACROS globally to work around host build differences.