OSDN Git Service
Ying Wang [Mon, 24 Mar 2014 19:45:15 +0000 (12:45 -0700)]
am
595f996f: am
7a93f683: am
82a2ae71: am
5a4c783c: am
8c60a1df: Merge "Complete installed shared library dependency"
* commit '
595f996f0d3d1aa4598218aade4b589cbbae79fa':
Complete installed shared library dependency
Ying Wang [Mon, 24 Mar 2014 19:36:32 +0000 (19:36 +0000)]
am
7a93f683: am
82a2ae71: am
5a4c783c: am
8c60a1df: Merge "Complete installed shared library dependency"
* commit '
7a93f68322eca5ccf32ca9544ba63ec64548e050':
Complete installed shared library dependency
Colin Cross [Sat, 22 Mar 2014 00:46:19 +0000 (17:46 -0700)]
am
cf1f9d2d: fix bad merge conflict resolution
* commit '
cf1f9d2d67411b91c6bc07a12595753471d86b8b':
fix bad merge conflict resolution
Colin Cross [Sat, 22 Mar 2014 00:41:26 +0000 (17:41 -0700)]
fix bad merge conflict resolution
Change-Id: I56c885df873ff6281f62a5c4e5d4db19138b591d
Colin Cross [Sat, 22 Mar 2014 00:34:14 +0000 (17:34 -0700)]
am
f2b60c0f: resolved conflicts for merge of
f8e4d1b7 to master
* commit '
f2b60c0f8052ed6b456e2f63a0e6798d049410ad':
Fix removal of PRODUCT_PREBUILT_WEBVIEWCHROMIUM
Colin Cross [Sat, 22 Mar 2014 00:25:08 +0000 (17:25 -0700)]
resolved conflicts for merge of
f8e4d1b7 to master
Change-Id: I387a979ac119fc9423af6f07b6700c85384aeb94
Ying Wang [Sat, 22 Mar 2014 00:06:57 +0000 (00:06 +0000)]
am
82a2ae71: am
5a4c783c: am
8c60a1df: Merge "Complete installed shared library dependency"
* commit '
82a2ae714c42f858985d56da7bc4a3ec1868c155':
Complete installed shared library dependency
Ying Wang [Sat, 22 Mar 2014 00:03:34 +0000 (00:03 +0000)]
am
5a4c783c: am
8c60a1df: Merge "Complete installed shared library dependency"
* commit '
5a4c783c2d960a4ab76b4cdd57933e31dbfe6211':
Complete installed shared library dependency
Ying Wang [Fri, 21 Mar 2014 23:54:48 +0000 (16:54 -0700)]
am
8c60a1df: Merge "Complete installed shared library dependency"
* commit '
8c60a1df4379bcc2fef020878aef8d78233f906d':
Complete installed shared library dependency
Ying Wang [Fri, 21 Mar 2014 23:51:33 +0000 (23:51 +0000)]
Merge "Complete installed shared library dependency"
Ying Wang [Fri, 21 Mar 2014 23:17:04 +0000 (16:17 -0700)]
Complete installed shared library dependency
Previously the installed shared library dependency doesn't include
modules introduced by LOCAL_SHARED_LIBRARIES_<arch>.
This change fix the problem.
It also cleans up use of the shared library variable.
Bug:
13528787
Change-Id: Id8d807cc57f0ec4a71f18b64545d91191efad8fb
Adam Hampson [Fri, 21 Mar 2014 21:36:39 +0000 (14:36 -0700)]
am
e3290e9e: Merge "move libbcc from core_base to core_minimal"
* commit '
e3290e9e46c2df798e08f3d939dd58de8d3d0862':
move libbcc from core_base to core_minimal
Adam Hampson [Fri, 21 Mar 2014 21:31:02 +0000 (21:31 +0000)]
Merge "move libbcc from core_base to core_minimal"
Lajos Molnar [Fri, 21 Mar 2014 21:18:38 +0000 (14:18 -0700)]
am
3d402686: Merge "stagefright: use media_codecs_google*.xml files"
* commit '
3d402686ca4444fea76137208af1fd71bcc8cb21':
stagefright: use media_codecs_google*.xml files
Lajos Molnar [Fri, 21 Mar 2014 21:15:32 +0000 (21:15 +0000)]
Merge "stagefright: use media_codecs_google*.xml files"
Adam Hampson [Fri, 21 Mar 2014 19:40:57 +0000 (12:40 -0700)]
move libbcc from core_base to core_minimal
Bug:
13528787
Change-Id: If8b531f71bf3831e4d3d59e2a2bc04dd72f4a8b1
Signed-off-by: Adam Hampson <ahampson@google.com>
Mark Renouf [Fri, 21 Mar 2014 16:26:32 +0000 (16:26 +0000)]
am
50449c9c: am
37f3c5cc: Fix removal of PRODUCT_PREBUILT_WEBVIEWCHROMIUM
* commit '
50449c9cfa558d2901aa95613f4eb8ced7680f25':
Fix removal of PRODUCT_PREBUILT_WEBVIEWCHROMIUM
Mark Renouf [Fri, 21 Mar 2014 16:22:07 +0000 (16:22 +0000)]
am
37f3c5cc: Fix removal of PRODUCT_PREBUILT_WEBVIEWCHROMIUM
* commit '
37f3c5cc1de11f7b316c2d03ed8f6951d4f95372':
Fix removal of PRODUCT_PREBUILT_WEBVIEWCHROMIUM
Mark Renouf [Fri, 21 Mar 2014 15:50:35 +0000 (11:50 -0400)]
Fix removal of PRODUCT_PREBUILT_WEBVIEWCHROMIUM
Change-Id: I8a6bad054ac22592f0d341bb3ebbe4cc74828698
Narayan Kamath [Fri, 21 Mar 2014 10:47:42 +0000 (03:47 -0700)]
am
9c2daa97: Merge "Add warning message for java6 builds."
* commit '
9c2daa97e109b2c38789371d6eaa113277cab5ac':
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."
Colin Cross [Thu, 20 Mar 2014 22:31:30 +0000 (15:31 -0700)]
am
58596266: am
e07f9225: am
7e998752: am
189a874f: am
8c1bbdb9: Merge "remove more projects from 64-bit blacklist"
* commit '
58596266c8d04e943dc3c54667114aa6afca0a96':
remove more projects from 64-bit blacklist
Ying Wang [Thu, 20 Mar 2014 22:31:30 +0000 (15:31 -0700)]
am
81717cc2: am
84fbc7e8: am
996f3826: am
c5a56344: am
1c43aaea: Merge "Remove the redundant DISABLE_DEXPREOPT"
* commit '
81717cc251d6890f5bf3fa042bd11d20c7ec556c':
Remove the redundant DISABLE_DEXPREOPT
Ying Wang [Thu, 20 Mar 2014 22:28:02 +0000 (15:28 -0700)]
am
636dc20d: resolved conflicts for merge of
ad495272 to master
* commit '
636dc20d1a2ddb44b345be5ad6e04024788ad90b':
Fix embedded build
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
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
Ying Wang [Thu, 20 Mar 2014 22:24:52 +0000 (15:24 -0700)]
resolved conflicts for merge of
ad495272 to master
Change-Id: I6b47768f44b1a6136ca31936e19f943ee72cb627
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
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
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
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
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
Colin Cross [Thu, 20 Mar 2014 20:16:53 +0000 (20:16 +0000)]
Merge "remove more projects from 64-bit blacklist"
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
Ying Wang [Thu, 20 Mar 2014 20:11:04 +0000 (20:11 +0000)]
Merge "Remove 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
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
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
Ying Wang [Thu, 20 Mar 2014 19:28:30 +0000 (12:28 -0700)]
am
4f9d6f57: Merge "Fix embedded build"
* commit '
4f9d6f57fdea05904c6f45c7799aa7a0d0a32457':
Fix embedded build
Ying Wang [Thu, 20 Mar 2014 19:25:09 +0000 (19:25 +0000)]
Merge "Fix 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
Narayan Kamath [Mon, 17 Feb 2014 18:09:13 +0000 (18:09 +0000)]
Add warning message for java6 builds.
Change-Id: If5a402e1412e5adb5340b101854e9fbb4c5d4ec8
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
Lajos Molnar [Wed, 19 Mar 2014 22:12:24 +0000 (15:12 -0700)]
stagefright: use media_codecs_google*.xml files
Bug:
13549114
Change-Id: I25d6344c78da152f394fa7b4855a2eb61008afc6
Glenn Kasten [Wed, 19 Mar 2014 21:58:58 +0000 (14:58 -0700)]
am
99401496: am
9a3f4999: am
a7c9d15e: am
b614ef1e: am
cb902fff: Merge "A few other removals for the 64 bit blacklist."
* commit '
994014964fc2e51c1388de707be2204558ca22cc':
A few other removals for the 64 bit blacklist.
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.
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.
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.
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.
Glenn Kasten [Wed, 19 Mar 2014 21:32:22 +0000 (21:32 +0000)]
Merge "A few other removals for the 64 bit blacklist."
Christopher Ferris [Wed, 19 Mar 2014 18:28:35 +0000 (11:28 -0700)]
am
ddb9b404: am
10eaabfc: am
a908fc96: am
aea9f041: am
8b1bcc7d: Merge "Add a method to leave the symbol table in a library."
* commit '
ddb9b4042e90edfb69ce403b5ad33e0610bd31c5':
Add a method to leave the symbol table in a library.
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.
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.
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.
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.
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."
Nick Kralevich [Wed, 19 Mar 2014 17:07:16 +0000 (10:07 -0700)]
am
db17a9d0: am
77e63659: am
cea2ad87: am
e623b4c2: am
f2fd6d9a: Merge "Allow shell serial_device read-write access"
* commit '
db17a9d00cdd890deb2a77e508a821ca21047073':
Allow shell serial_device read-write access
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
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
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
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
Nick Kralevich [Wed, 19 Mar 2014 16:37:39 +0000 (16:37 +0000)]
Merge "Allow shell serial_device read-write access"
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
Tim Kilbourn [Wed, 19 Mar 2014 09:46:09 +0000 (02:46 -0700)]
am
772af0c6: am
d5c004b3: am
2389da57: am
8acc8da4: Add v17/leanback to pathmap.
* commit '
772af0c64396b336a845d63de910fbe6afcd6ce0':
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.
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.
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.
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
Ying Wang [Tue, 18 Mar 2014 23:20:48 +0000 (16:20 -0700)]
am
8888faa5: am
5245393e: am
e3687086: am
87a25ea7: am
bce52ca5: Merge "Remove arm64 clang build warning"
* commit '
8888faa549758fd8759fca5e9d6b059087ae2395':
Remove arm64 clang build warning
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
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
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
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
Ying Wang [Tue, 18 Mar 2014 22:58:49 +0000 (22:58 +0000)]
Merge "Remove 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
Geremy Condra [Tue, 18 Mar 2014 22:26:35 +0000 (15:26 -0700)]
am
acd99d93: Merge "Add verity build targets for verity-enabled devices."
* commit '
acd99d936784df8eaaed2796ef02c516dc4eb908':
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."
Tim Kilbourn [Tue, 18 Mar 2014 20:37:51 +0000 (13:37 -0700)]
Add v17/leanback to pathmap.
Change-Id: I3032710da8cf8714516bf78f0971223257dfe1ec
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
Glenn Kasten [Tue, 18 Mar 2014 22:07:35 +0000 (15:07 -0700)]
am
f2a57a56: am
66b6b628: am
0c2acdc0: am
023c2865: am
97542cc9: Merge "Don\'t blacklist all of frameworks/av for 64-bit"
* commit '
f2a57a5697e7c5584a570fc6e52e3dabaddff4ce':
Don't blacklist all of frameworks/av for 64-bit
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
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
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
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
Glenn Kasten [Tue, 18 Mar 2014 21:45:12 +0000 (21:45 +0000)]
Merge "Don't blacklist all of frameworks/av for 64-bit"
Greg Hackmann [Tue, 18 Mar 2014 21:01:17 +0000 (14:01 -0700)]
am
c217d7b7: am
6099a84f: am
2521d0d2: am
5a4183f3: am
267afcde: Merge "HACK: disable emulator on x86_64"
* commit '
c217d7b7c1aa1ec553c6bb97b7534df0aa20433e':
HACK: disable emulator on x86_64
Ying Wang [Tue, 18 Mar 2014 21:01:16 +0000 (14:01 -0700)]
am
145374e0: am
1bd53e59: am
59683508: am
5462f7f9: am
255ea2bd: Merge "Remove unused LOCAL_ASSET_FILES."
* commit '
145374e097034b886fcb040b0b1aef381304efb4':
Remove unused LOCAL_ASSET_FILES.
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
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.
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
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
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
Greg Hackmann [Tue, 18 Mar 2014 19:21:48 +0000 (19:21 +0000)]
Merge "HACK: disable emulator on x86_64"
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
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.
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.
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.
Ying Wang [Tue, 18 Mar 2014 18:32:05 +0000 (18:32 +0000)]
Merge "Remove 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
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>