Narayan Kamath
9c2daa97e1
Merge "Add warning message for java6 builds."
2014-03-21 10:43:49 +00:00
Colin Cross
58596266c8
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
2014-03-20 22:27:16 +00:00
Ying Wang
81717cc251
am 84fbc7e8: am 996f3826: am c5a56344: am 1c43aaea: Merge "Remove the redundant DISABLE_DEXPREOPT"
...
* commit '84fbc7e82a0a075c3cc8bb73baa9e6d87fd53aa4':
Remove the redundant DISABLE_DEXPREOPT
2014-03-20 22:27:16 +00:00
Ying Wang
636dc20d1a
resolved conflicts for merge of ad495272
to master
...
Change-Id: I6b47768f44b1a6136ca31936e19f943ee72cb627
2014-03-20 15:24:52 -07:00
Colin Cross
7e998752d7
am 189a874f: am 8c1bbdb9: Merge "remove more projects from 64-bit blacklist"
...
* commit '189a874f0f3d297107d02222dc3291943a9e82b0':
remove more projects from 64-bit blacklist
2014-03-20 20:23:05 +00:00
Ying Wang
996f3826f7
am c5a56344: am 1c43aaea: Merge "Remove the redundant DISABLE_DEXPREOPT"
...
* commit 'c5a563447a68c30dd998b7cd6f8f8c30693edc37':
Remove the redundant DISABLE_DEXPREOPT
2014-03-20 20:18:38 +00:00
Colin Cross
8c1bbdb96e
Merge "remove more projects from 64-bit blacklist"
2014-03-20 20:16:53 +00:00
Ying Wang
c6848b398d
Remove the redundant DISABLE_DEXPREOPT
...
To disable dexpreopt, use just:
WITH_DEXPREOPT=false
Change-Id: I5804f3774f8ec50eb16c5336776dbce0c28b16d9
2014-03-20 13:01:31 -07:00
Ying Wang
46d69e9914
am 9ce34617: am 4f9d6f57: Merge "Fix embedded build"
...
* commit '9ce34617a001338093b0de85443925a37a967f0d':
Fix embedded build
2014-03-20 19:36:32 +00:00
Ying Wang
8c7e74ee05
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
2014-03-20 12:13:10 -07:00
Narayan Kamath
8c06afdea3
Add warning message for java6 builds.
...
Change-Id: If5a402e1412e5adb5340b101854e9fbb4c5d4ec8
2014-03-20 10:35:52 +00:00
Colin Cross
e6d118574b
remove more projects from 64-bit blacklist
...
These all build now.
Change-Id: If7c5f58512a2931617900ddc730797750ab8301c
2014-03-20 00:08:20 -07:00
Glenn Kasten
994014964f
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.
2014-03-19 21:53:49 +00:00
Glenn Kasten
a7c9d15e82
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.
2014-03-19 21:44:07 +00:00
Glenn Kasten
cb902fff82
Merge "A few other removals for the 64 bit blacklist."
2014-03-19 21:32:22 +00:00
Christopher Ferris
ddb9b4042e
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.
2014-03-19 18:25:22 +00:00
Christopher Ferris
a908fc96db
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.
2014-03-19 18:15:39 +00:00
Narayan Kamath
c7d24d029b
A few other removals for the 64 bit blacklist.
...
- external/chromium now compiles
- stagefright codecs now compile.
- frameworks/base now compiles.
Change-Id: I1226b79cd3e0b5e2fd786bb506e022b47fe5e264
2014-03-19 13:15:31 +00:00
Tim Kilbourn
772af0c643
am d5c004b3: am 2389da57: am 8acc8da4: Add v17/leanback to pathmap.
...
* commit 'd5c004b39483bcd599d03098e7d3bd8af88b23a1':
Add v17/leanback to pathmap.
2014-03-19 09:42:20 +00:00
Tim Kilbourn
2389da5787
am 8acc8da4: Add v17/leanback to pathmap.
...
* commit '8acc8da42d1971792090f3b80b1900427e5d37fc':
Add v17/leanback to pathmap.
2014-03-19 09:23:43 +00:00
Christopher Ferris
a6e2f9322c
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
2014-03-18 17:34:41 -07:00
Ying Wang
8888faa549
am 5245393e: am e3687086: am 87a25ea7: am bce52ca5: Merge "Remove arm64 clang build warning"
...
* commit '5245393ef6b18c181fac43111a1dbfa6f829af01':
Remove arm64 clang build warning
2014-03-18 23:17:40 +00:00
Ying Wang
e36870862e
am 87a25ea7: am bce52ca5: Merge "Remove arm64 clang build warning"
...
* commit '87a25ea72f41b77898e62ad09e48e0b0de1dc84f':
Remove arm64 clang build warning
2014-03-18 23:07:49 +00:00
Ying Wang
ed56902c29
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
2014-03-18 15:58:13 -07:00
Tim Kilbourn
8acc8da42d
Add v17/leanback to pathmap.
...
Change-Id: I3032710da8cf8714516bf78f0971223257dfe1ec
2014-03-18 15:20:15 -07:00
Glenn Kasten
f2a57a5697
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
2014-03-18 22:01:52 +00:00
Glenn Kasten
0c2acdc042
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
2014-03-18 21:53:41 +00:00
Glenn Kasten
97542cc9bf
Merge "Don't blacklist all of frameworks/av for 64-bit"
2014-03-18 21:45:12 +00:00
Ying Wang
145374e097
am 1bd53e59: am 59683508: am 5462f7f9: am 255ea2bd: Merge "Remove unused LOCAL_ASSET_FILES."
...
* commit '1bd53e59558f7973a038f4b0d5c78a7fdfa45f91':
Remove unused LOCAL_ASSET_FILES.
2014-03-18 20:52:55 +00:00
Glenn Kasten
488fe8481a
Don't blacklist all of frameworks/av for 64-bit
...
Change-Id: Ic2db99b1b577e3355c50982af5068bce32edf4ba
2014-03-18 12:12:54 -07:00
Ying Wang
5968350855
am 5462f7f9: am 255ea2bd: Merge "Remove unused LOCAL_ASSET_FILES."
...
* commit '5462f7f953915bd345a58b17977e79e6405b56d0':
Remove unused LOCAL_ASSET_FILES.
2014-03-18 18:44:32 +00:00
Ying Wang
594f2a4261
Remove unused LOCAL_ASSET_FILES.
...
Change-Id: Ie0b2b2e30a158b779016767fb868f3e03b2f828a
2014-03-18 11:31:09 -07:00
Andrew Hsieh
96000a611a
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
2014-03-18 00:15:28 +00:00
Andrew Hsieh
66a4ef8f75
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
2014-03-18 00:09:13 +00:00
Andrew Hsieh
73d800e519
Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared
...
Add llvm libc++ static and shared libraries
Change-Id: I92af9b6ab21cbf8ea82e014a4c11aeb5455920f9
2014-03-17 20:30:45 +08:00
Ying Wang
f132da6b50
am df0c90d0: am ce418783: am a660d06e: am 1cda15d3: Merge "Don\'t modify LOCAL_STRIP_MODULE"
...
* commit 'df0c90d0e544c9353df0135a23643aea043a9f4b':
Don't modify LOCAL_STRIP_MODULE
2014-03-16 20:16:45 +00:00
Ying Wang
ce4187832a
am a660d06e: am 1cda15d3: Merge "Don\'t modify LOCAL_STRIP_MODULE"
...
* commit 'a660d06eeb9a53bc8d88fc2e559d461dc6a77d67':
Don't modify LOCAL_STRIP_MODULE
2014-03-16 20:08:31 +00:00
Ying Wang
1cda15d323
Merge "Don't modify LOCAL_STRIP_MODULE"
2014-03-16 20:02:56 +00:00
Ying Wang
e1889af2d5
Don't modify LOCAL_STRIP_MODULE
...
LOCAL_STRIP_MODULE will be reused in multilib build.
Change-Id: I3512efb360c7eaafad02859723ab4368778effed
2014-03-16 12:43:49 -07:00
Colin Cross
0af8bc1ed1
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.
2014-03-16 00:06:17 +00:00
Colin Cross
8213b719c8
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.
2014-03-15 23:59:32 +00:00
Colin Cross
db24577bbd
Merge "Work in progress to enable build system support for Clang."
2014-03-15 23:54:03 +00:00
Andrew Hsieh
51ffb467a9
am 70dff286: am 228f8afc: am de8edc8a: am 933e8940: Merge "Fix HOST_TOOLCHAIN_PREFIX"
...
* commit '70dff2866fd7a22a7248a80fd888d167c0f7636a':
Fix HOST_TOOLCHAIN_PREFIX
2014-03-14 17:13:11 +00:00
Tim Murray
b5f333bbef
Work in progress to enable build system support for Clang.
...
Change-Id: I278b48bcd976afcbde8d86261da9b9b9efc9002c
2014-03-14 00:39:03 -07:00
Andrew Hsieh
228f8afc4d
am de8edc8a: am 933e8940: Merge "Fix HOST_TOOLCHAIN_PREFIX"
...
* commit 'de8edc8a35e5a53c6f1f8e5db099c28691319585':
Fix HOST_TOOLCHAIN_PREFIX
2014-03-14 00:26:55 +00:00
Andrew Hsieh
933e8940d0
Merge "Fix HOST_TOOLCHAIN_PREFIX"
2014-03-14 00:19:19 +00:00
Hui Shu
2ecd9fc969
Merge "Fix another build break."
2014-03-13 23:35:42 +00:00
Hui Shu
ec21c58574
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
2014-03-13 16:31:21 -07:00
Narayan Kamath
70df4dc56a
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."
2014-03-13 23:11:49 +00:00
Hui Shu
f6a9b877b5
Fix the build break.
...
BUG: b/11293324
Should find the removed.txt under frameworks/base/api/
Change-Id: Icd937cb8c1a7f23dba35c440045cea54e2a8242e
2014-03-13 15:40:55 -07:00