OSDN Git Service

android-x86/build.git
10 years agoMerge "Add warning message for java6 builds."
Narayan Kamath [Fri, 21 Mar 2014 10:43:49 +0000 (10:43 +0000)]
Merge "Add warning message for java6 builds."

10 years agoam e07f9225: am 7e998752: am 189a874f: am 8c1bbdb9: Merge "remove more projects from...
Colin Cross [Thu, 20 Mar 2014 22:27:16 +0000 (22:27 +0000)]
am e07f9225: am 7e998752: am 189a874f: am 8c1bbdb9: Merge "remove more projects from 64-bit blacklist"

* commit 'e07f922563e5f3a093187a1e260451c3544bc051':
  remove more projects from 64-bit blacklist

10 years agoam 84fbc7e8: am 996f3826: am c5a56344: am 1c43aaea: Merge "Remove the redundant DISAB...
Ying Wang [Thu, 20 Mar 2014 22:27:16 +0000 (22:27 +0000)]
am 84fbc7e8: am 996f3826: am c5a56344: am 1c43aaea: Merge "Remove the redundant DISABLE_DEXPREOPT"

* commit '84fbc7e82a0a075c3cc8bb73baa9e6d87fd53aa4':
  Remove the redundant DISABLE_DEXPREOPT

10 years agoresolved conflicts for merge of ad495272 to master
Ying Wang [Thu, 20 Mar 2014 22:24:52 +0000 (15:24 -0700)]
resolved conflicts for merge of ad495272 to master

Change-Id: I6b47768f44b1a6136ca31936e19f943ee72cb627

10 years agoam 7e998752: am 189a874f: am 8c1bbdb9: Merge "remove more projects from 64-bit blacklist"
Colin Cross [Thu, 20 Mar 2014 20:26:54 +0000 (20:26 +0000)]
am 7e998752: am 189a874f: am 8c1bbdb9: Merge "remove more projects from 64-bit blacklist"

* commit '7e998752d73408516104419581d3c70f0d5396c3':
  remove more projects from 64-bit blacklist

10 years agoam 996f3826: am c5a56344: am 1c43aaea: Merge "Remove the redundant DISABLE_DEXPREOPT"
Ying Wang [Thu, 20 Mar 2014 20:23:29 +0000 (20:23 +0000)]
am 996f3826: am c5a56344: am 1c43aaea: Merge "Remove the redundant DISABLE_DEXPREOPT"

* commit '996f3826f7005cf207c8565f674ee38df1ada153':
  Remove the redundant DISABLE_DEXPREOPT

10 years agoam 189a874f: am 8c1bbdb9: Merge "remove more projects from 64-bit blacklist"
Colin Cross [Thu, 20 Mar 2014 20:23:05 +0000 (20:23 +0000)]
am 189a874f: am 8c1bbdb9: Merge "remove more projects from 64-bit blacklist"

* commit '189a874f0f3d297107d02222dc3291943a9e82b0':
  remove more projects from 64-bit blacklist

10 years agoam 8c1bbdb9: Merge "remove more projects from 64-bit blacklist"
Colin Cross [Thu, 20 Mar 2014 20:20:04 +0000 (13:20 -0700)]
am 8c1bbdb9: Merge "remove more projects from 64-bit blacklist"

* commit '8c1bbdb96ee1ea6be4d35236d8af20d5a2d78f6f':
  remove more projects from 64-bit blacklist

10 years agoam c5a56344: am 1c43aaea: Merge "Remove the redundant DISABLE_DEXPREOPT"
Ying Wang [Thu, 20 Mar 2014 20:18:38 +0000 (20:18 +0000)]
am c5a56344: am 1c43aaea: Merge "Remove the redundant DISABLE_DEXPREOPT"

* commit 'c5a563447a68c30dd998b7cd6f8f8c30693edc37':
  Remove the redundant DISABLE_DEXPREOPT

10 years agoMerge "remove more projects from 64-bit blacklist"
Colin Cross [Thu, 20 Mar 2014 20:16:53 +0000 (20:16 +0000)]
Merge "remove more projects from 64-bit blacklist"

10 years agoam 1c43aaea: Merge "Remove the redundant DISABLE_DEXPREOPT"
Ying Wang [Thu, 20 Mar 2014 20:14:12 +0000 (13:14 -0700)]
am 1c43aaea: Merge "Remove the redundant DISABLE_DEXPREOPT"

* commit '1c43aaea07fdf2665f1d2305fe16cb29811b32ee':
  Remove the redundant DISABLE_DEXPREOPT

10 years agoMerge "Remove the redundant DISABLE_DEXPREOPT"
Ying Wang [Thu, 20 Mar 2014 20:11:04 +0000 (20:11 +0000)]
Merge "Remove the redundant DISABLE_DEXPREOPT"

10 years agoRemove the redundant DISABLE_DEXPREOPT
Ying Wang [Thu, 20 Mar 2014 19:57:19 +0000 (12:57 -0700)]
Remove the redundant DISABLE_DEXPREOPT

To disable dexpreopt, use just:
WITH_DEXPREOPT=false

Change-Id: I5804f3774f8ec50eb16c5336776dbce0c28b16d9

10 years agoam 46d69e99: am 9ce34617: am 4f9d6f57: Merge "Fix embedded build"
Ying Wang [Thu, 20 Mar 2014 19:40:39 +0000 (19:40 +0000)]
am 46d69e99: am 9ce34617: am 4f9d6f57: Merge "Fix embedded build"

* commit '46d69e9914ad359b63637f9734cf9e85e04af1a9':
  Fix embedded build

10 years agoam 9ce34617: am 4f9d6f57: Merge "Fix embedded build"
Ying Wang [Thu, 20 Mar 2014 19:36:32 +0000 (19:36 +0000)]
am 9ce34617: am 4f9d6f57: Merge "Fix embedded build"

* commit '9ce34617a001338093b0de85443925a37a967f0d':
  Fix embedded build

10 years agoam 4f9d6f57: Merge "Fix embedded build"
Ying Wang [Thu, 20 Mar 2014 19:28:30 +0000 (12:28 -0700)]
am 4f9d6f57: Merge "Fix embedded build"

* commit '4f9d6f57fdea05904c6f45c7799aa7a0d0a32457':
  Fix embedded build

10 years agoMerge "Fix embedded build"
Ying Wang [Thu, 20 Mar 2014 19:25:09 +0000 (19:25 +0000)]
Merge "Fix embedded build"

10 years agoFix embedded build
Ying Wang [Thu, 20 Mar 2014 19:13:10 +0000 (12:13 -0700)]
Fix embedded build

1) Disable dexpreopt if DALVIK_VM_LIB isn't set up by the product.
2) DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES is moved to config.mk,
for it's only decided by target arch.
3) Move Java module input from embedded.mk to base.mk.

Change-Id: Ife70b0cd8cee2e5c92f356c808affa56f494b49a

10 years agoAdd warning message for java6 builds.
Narayan Kamath [Mon, 17 Feb 2014 18:09:13 +0000 (18:09 +0000)]
Add warning message for java6 builds.

Change-Id: If5a402e1412e5adb5340b101854e9fbb4c5d4ec8

10 years agoremove more projects from 64-bit blacklist
Colin Cross [Thu, 20 Mar 2014 07:08:20 +0000 (00:08 -0700)]
remove more projects from 64-bit blacklist

These all build now.

Change-Id: If7c5f58512a2931617900ddc730797750ab8301c

10 years agoam 9a3f4999: am a7c9d15e: am b614ef1e: am cb902fff: Merge "A few other removals for...
Glenn Kasten [Wed, 19 Mar 2014 21:53:49 +0000 (21:53 +0000)]
am 9a3f4999: am a7c9d15e: am b614ef1e: am cb902fff: Merge "A few other removals for the 64 bit blacklist."

* commit '9a3f499978cc46b35e76f2d9dd4a282b4b0a649f':
  A few other removals for the 64 bit blacklist.

10 years agoam a7c9d15e: am b614ef1e: am cb902fff: Merge "A few other removals for the 64 bit...
Glenn Kasten [Wed, 19 Mar 2014 21:48:30 +0000 (21:48 +0000)]
am a7c9d15e: am b614ef1e: am cb902fff: Merge "A few other removals for the 64 bit blacklist."

* commit 'a7c9d15e82c922b38206af47749e5ab2aa23f814':
  A few other removals for the 64 bit blacklist.

10 years agoam b614ef1e: am cb902fff: Merge "A few other removals for the 64 bit blacklist."
Glenn Kasten [Wed, 19 Mar 2014 21:44:07 +0000 (21:44 +0000)]
am b614ef1e: am cb902fff: Merge "A few other removals for the 64 bit blacklist."

* commit 'b614ef1eef10815652451c332954a6a6ee6f02ba':
  A few other removals for the 64 bit blacklist.

10 years agoam cb902fff: Merge "A few other removals for the 64 bit blacklist."
Glenn Kasten [Wed, 19 Mar 2014 21:36:43 +0000 (14:36 -0700)]
am cb902fff: Merge "A few other removals for the 64 bit blacklist."

* commit 'cb902fff82487a63e36e94105db79d4312ea4736':
  A few other removals for the 64 bit blacklist.

10 years agoMerge "A few other removals for the 64 bit blacklist."
Glenn Kasten [Wed, 19 Mar 2014 21:32:22 +0000 (21:32 +0000)]
Merge "A few other removals for the 64 bit blacklist."

10 years agoam 10eaabfc: am a908fc96: am aea9f041: am 8b1bcc7d: Merge "Add a method to leave...
Christopher Ferris [Wed, 19 Mar 2014 18:25:22 +0000 (18:25 +0000)]
am 10eaabfc: am a908fc96: am aea9f041: am 8b1bcc7d: Merge "Add a method to leave the symbol table in a library."

* commit '10eaabfceb715baecbcdf71ebfb4f108ce295fb6':
  Add a method to leave the symbol table in a library.

10 years agoam a908fc96: am aea9f041: am 8b1bcc7d: Merge "Add a method to leave the symbol table...
Christopher Ferris [Wed, 19 Mar 2014 18:21:09 +0000 (18:21 +0000)]
am a908fc96: am aea9f041: am 8b1bcc7d: Merge "Add a method to leave the symbol table in a library."

* commit 'a908fc96db10d2efa173ebcfcd272b757cc19abf':
  Add a method to leave the symbol table in a library.

10 years agoam aea9f041: am 8b1bcc7d: Merge "Add a method to leave the symbol table in a library."
Christopher Ferris [Wed, 19 Mar 2014 18:15:39 +0000 (18:15 +0000)]
am aea9f041: am 8b1bcc7d: Merge "Add a method to leave the symbol table in a library."

* commit 'aea9f041f72a128065691ac402ccdb72a5a7aad4':
  Add a method to leave the symbol table in a library.

10 years agoam 8b1bcc7d: Merge "Add a method to leave the symbol table in a library."
Christopher Ferris [Wed, 19 Mar 2014 18:11:12 +0000 (11:11 -0700)]
am 8b1bcc7d: Merge "Add a method to leave the symbol table in a library."

* commit '8b1bcc7dc72038ecf80d174cc551cce81978ec95':
  Add a method to leave the symbol table in a library.

10 years agoMerge "Add a method to leave the symbol table in a library."
Christopher Ferris [Wed, 19 Mar 2014 18:07:18 +0000 (18:07 +0000)]
Merge "Add a method to leave the symbol table in a library."

10 years agoam 77e63659: am cea2ad87: am e623b4c2: am f2fd6d9a: Merge "Allow shell serial_device...
Nick Kralevich [Wed, 19 Mar 2014 17:02:27 +0000 (17:02 +0000)]
am 77e63659: am cea2ad87: am e623b4c2: am f2fd6d9a: Merge "Allow shell serial_device read-write access"

* commit '77e63659d3d7be6ea891b07ae5f84cee70a392fa':
  Allow shell serial_device read-write access

10 years agoam cea2ad87: am e623b4c2: am f2fd6d9a: Merge "Allow shell serial_device read-write...
Nick Kralevich [Wed, 19 Mar 2014 16:57:02 +0000 (16:57 +0000)]
am cea2ad87: am e623b4c2: am f2fd6d9a: Merge "Allow shell serial_device read-write access"

* commit 'cea2ad87ffe2222d3afb73195f94344fafcdf8da':
  Allow shell serial_device read-write access

10 years agoam e623b4c2: am f2fd6d9a: Merge "Allow shell serial_device read-write access"
Nick Kralevich [Wed, 19 Mar 2014 16:49:21 +0000 (16:49 +0000)]
am e623b4c2: am f2fd6d9a: Merge "Allow shell serial_device read-write access"

* commit 'e623b4c2c2b585ad19627e13347474b70377c78b':
  Allow shell serial_device read-write access

10 years agoam f2fd6d9a: Merge "Allow shell serial_device read-write access"
Nick Kralevich [Wed, 19 Mar 2014 16:43:24 +0000 (09:43 -0700)]
am f2fd6d9a: Merge "Allow shell serial_device read-write access"

* commit 'f2fd6d9af27c1ba70679d07f237d48f86ae3532f':
  Allow shell serial_device read-write access

10 years agoMerge "Allow shell serial_device read-write access"
Nick Kralevich [Wed, 19 Mar 2014 16:37:39 +0000 (16:37 +0000)]
Merge "Allow shell serial_device read-write access"

10 years agoA few other removals for the 64 bit blacklist.
Narayan Kamath [Wed, 19 Mar 2014 09:04:28 +0000 (09:04 +0000)]
A few other removals for the 64 bit blacklist.

- external/chromium now compiles
- stagefright codecs now compile.
- frameworks/base now compiles.

Change-Id: I1226b79cd3e0b5e2fd786bb506e022b47fe5e264

10 years agoam d5c004b3: am 2389da57: am 8acc8da4: Add v17/leanback to pathmap.
Tim Kilbourn [Wed, 19 Mar 2014 09:42:20 +0000 (09:42 +0000)]
am d5c004b3: am 2389da57: am 8acc8da4: Add v17/leanback to pathmap.

* commit 'd5c004b39483bcd599d03098e7d3bd8af88b23a1':
  Add v17/leanback to pathmap.

10 years agoam 2389da57: am 8acc8da4: Add v17/leanback to pathmap.
Tim Kilbourn [Wed, 19 Mar 2014 09:32:09 +0000 (09:32 +0000)]
am 2389da57: am 8acc8da4: Add v17/leanback to pathmap.

* commit '2389da5787e50a4deb942d0faf9a66c61d7a6e60':
  Add v17/leanback to pathmap.

10 years agoam 8acc8da4: Add v17/leanback to pathmap.
Tim Kilbourn [Wed, 19 Mar 2014 09:23:43 +0000 (09:23 +0000)]
am 8acc8da4: Add v17/leanback to pathmap.

* commit '8acc8da42d1971792090f3b80b1900427e5d37fc':
  Add v17/leanback to pathmap.

10 years agoAdd a method to leave the symbol table in a library.
Christopher Ferris [Tue, 18 Mar 2014 21:50:09 +0000 (14:50 -0700)]
Add a method to leave the symbol table in a library.

When LOCAL_STRIP_MODULE := keep_symbols is set, then the normal strip rules
will be modified so that only the .debug_* sections are removed. The original
symbol table is left alone.

This allows the compilation of certain libraries so that libbacktrace library
can provide meaningful names to functions.

Bug: 12958251
Change-Id: I82bdc304a463012e29086325ccb51163464cb4a9

10 years agoam 5245393e: am e3687086: am 87a25ea7: am bce52ca5: Merge "Remove arm64 clang build...
Ying Wang [Tue, 18 Mar 2014 23:17:40 +0000 (23:17 +0000)]
am 5245393e: am e3687086: am 87a25ea7: am bce52ca5: Merge "Remove arm64 clang build warning"

* commit '5245393ef6b18c181fac43111a1dbfa6f829af01':
  Remove arm64 clang build warning

10 years agoam e3687086: am 87a25ea7: am bce52ca5: Merge "Remove arm64 clang build warning"
Ying Wang [Tue, 18 Mar 2014 23:13:14 +0000 (23:13 +0000)]
am e3687086: am 87a25ea7: am bce52ca5: Merge "Remove arm64 clang build warning"

* commit 'e36870862e5e5b16bbb6afb952bd32d78e91cbff':
  Remove arm64 clang build warning

10 years agoam 87a25ea7: am bce52ca5: Merge "Remove arm64 clang build warning"
Ying Wang [Tue, 18 Mar 2014 23:07:49 +0000 (23:07 +0000)]
am 87a25ea7: am bce52ca5: Merge "Remove arm64 clang build warning"

* commit '87a25ea72f41b77898e62ad09e48e0b0de1dc84f':
  Remove arm64 clang build warning

10 years agoam bce52ca5: Merge "Remove arm64 clang build warning"
Ying Wang [Tue, 18 Mar 2014 23:03:24 +0000 (16:03 -0700)]
am bce52ca5: Merge "Remove arm64 clang build warning"

* commit 'bce52ca5fae5d0062e7622d758a3619f2279c666':
  Remove arm64 clang build warning

10 years agoMerge "Remove arm64 clang build warning"
Ying Wang [Tue, 18 Mar 2014 22:58:49 +0000 (22:58 +0000)]
Merge "Remove arm64 clang build warning"

10 years agoRemove arm64 clang build warning
Ying Wang [Tue, 18 Mar 2014 22:12:29 +0000 (15:12 -0700)]
Remove arm64 clang build warning

Now we have enabled arm64 clang.
This change remvoed arm64 clang build warning and cleaned the
arm64 unknow c flags.

Change-Id: Ia583a78c6d364e603ff09df423aa34a6e03d0b9b

10 years agoMerge "Add verity build targets for verity-enabled devices."
Geremy Condra [Tue, 18 Mar 2014 22:23:48 +0000 (22:23 +0000)]
Merge "Add verity build targets for verity-enabled devices."

10 years agoAdd v17/leanback to pathmap.
Tim Kilbourn [Tue, 18 Mar 2014 20:37:51 +0000 (13:37 -0700)]
Add v17/leanback to pathmap.

Change-Id: I3032710da8cf8714516bf78f0971223257dfe1ec

10 years agoAllow shell serial_device read-write access
Nick Kralevich [Tue, 18 Mar 2014 22:17:35 +0000 (15:17 -0700)]
Allow shell serial_device read-write access

When starting the emulator, the system console writes entries
to /dev/ttyS2. We need to allow the writes, otherwise this generates
denials when you run "emulator -verbose -logcat '*:v' -show-kernel"

Addresses the following denial:
type=1400 audit(1395076594.320:446): avc:  denied  { read write } for  pid=5600 comm="sh" path="/dev/ttyS2" dev="tmpfs" ino=1487 scontext=u:r:shell:s0 tcontext=u:object_r:serial_device:s0 tclass=chr_file

Bug: 13506702
Change-Id: I3729537cabb0bf8e8b2905d3def43a293bb1081f

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 agoAdd verity build targets for verity-enabled devices.
Geremy Condra [Tue, 18 Mar 2014 00:37:22 +0000 (17:37 -0700)]
Add verity build targets for verity-enabled devices.

Change-Id: Ia9fa8e7ebe01b63e50d61071d36165a6a820c6c4

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