Commit Graph

4296 Commits

Author SHA1 Message Date
Colin Cross
c93c10a75b am 8295d6cd: am ce087413: am 36a67a90: Merge topic \'tests\'
* commit '8295d6cd62ba73ea66e64204d2d0ea27b4b34889':
  add support for LOCAL_MODULE_STEM_32 and LOCAL_MODULE_STEM_64
  add support for LOCAL_MODULE_PATH_32 and LOCAL_MODULE_PATH_64
2014-03-25 23:48:13 +00:00
Colin Cross
8295d6cd62 am ce087413: am 36a67a90: Merge topic \'tests\'
* commit 'ce08741397e0468185457f5c7e8aee08272e6752':
  add support for LOCAL_MODULE_STEM_32 and LOCAL_MODULE_STEM_64
  add support for LOCAL_MODULE_PATH_32 and LOCAL_MODULE_PATH_64
2014-03-25 23:44:58 +00:00
Ying Wang
dbe23f5d98 Set up dependency of resource_export_package
The rules to build $(resource_export_package) need also the
framework-res's and potentially other shared libraries' package-export.apks.

Change-Id: I9ff10c621917ba7eed2da11a51cd2426845ad9be
2014-03-25 14:42:46 -07:00
Tim Murray
1bbba7d404 am 9c08a73b: am 6440fb0c: am b35094ec: am 01aa01db: Merge "Make Clang host builds hermetic on Linux."
* commit '9c08a73b242344a18676a2c5b17f5d475abef16f':
  Make Clang host builds hermetic on Linux.
2014-03-25 21:22:55 +00:00
Colin Cross
9b269f228c am 3c1183a6: am 3a943c9e: am 0143ee4a: am a3c76c28: Merge "remove libeffects from 64-bit blacklist"
* commit '3c1183a6634eb37d66e17c0947d9f696cd28e810':
  remove libeffects from 64-bit blacklist
2014-03-25 21:22:54 +00:00
Ying Wang
c63d345b18 am 264a5ed3: am 711951ab: am 78a819d6: am 266cf4f2: am f39752e9: Skip the product-scoped --product flag if it\'s set in LOCAL_AAPT_FLAGS
* commit '264a5ed3654b71ddc3c6dc0a52371624b2fa5204':
  Skip the product-scoped --product flag if it's set in LOCAL_AAPT_FLAGS
2014-03-25 21:19:18 +00:00
Adam Lesinski
de057c3063 Add LOCAL_APK_LIBRARIES to the AAPT -I flag
Change-Id: I5c5c90de3c8ce6c224b6e3fbf42d5e72cfd7a4d1
2014-03-25 13:52:17 -07:00
Colin Cross
5a9db90e40 add support for LOCAL_MODULE_STEM_32 and LOCAL_MODULE_STEM_64
Some executables will need to be built for both 32-bit and 64-bit.
For linker/linker64, debuggerd/debuggerd64, and a few more, they
will be installed in the same path (/system/bin), but with different
filenames.  Allow the module to specify LOCAL_MODULE_STEM_32 and
LOCAL_MODULE_STEM_64 to name the two versions.

Change-Id: I573e8678c7332245a064f31246be0a05f0a9e25f
2014-03-25 13:49:58 -07:00
Colin Cross
87974056d9 add support for LOCAL_MODULE_PATH_32 and LOCAL_MODULE_PATH_64
Some executables will need to be built for both 32-bit and 64-bit.
For tests, it will be convienient to keep the name of the executable
the same, but install them in a different location.  Add
LOCAL_MODULE_PATH_32 and LOCAL_MODULE_PATH_64 to allow a module
to specify different paths for 32-bit and 64-bit executables.

Change-Id: I3be830e899c6d485fe55c25c66b20b3fe64c795e
2014-03-25 13:48:40 -07:00
Tim Murray
6440fb0c84 am b35094ec: am 01aa01db: Merge "Make Clang host builds hermetic on Linux."
* commit 'b35094ec709c8de7f3f7d6dbd54655ec99cd9529':
  Make Clang host builds hermetic on Linux.
2014-03-25 19:09:35 +00:00
Colin Cross
3a943c9e57 am 0143ee4a: am a3c76c28: Merge "remove libeffects from 64-bit blacklist"
* commit '0143ee4a5779620659c7b59e4294359c4a96af78':
  remove libeffects from 64-bit blacklist
2014-03-25 19:09:33 +00:00
Tim Murray
01aa01dbfa Merge "Make Clang host builds hermetic on Linux." 2014-03-25 18:33:29 +00:00
Colin Cross
a3c76c2824 Merge "remove libeffects from 64-bit blacklist" 2014-03-25 17:54:56 +00:00
Ying Wang
711951abf0 am 78a819d6: am 266cf4f2: am f39752e9: Skip the product-scoped --product flag if it\'s set in LOCAL_AAPT_FLAGS
* commit '78a819d600ab750227009fd3dc93f7f2886600c7':
  Skip the product-scoped --product flag if it's set in LOCAL_AAPT_FLAGS
2014-03-25 10:04:39 +00:00
Ying Wang
78a819d600 am 266cf4f2: am f39752e9: Skip the product-scoped --product flag if it\'s set in LOCAL_AAPT_FLAGS
* commit '266cf4f2595323170fe02db05835884b4522a0f9':
  Skip the product-scoped --product flag if it's set in LOCAL_AAPT_FLAGS
2014-03-25 09:56:52 +00:00
Andrew Hsieh
1477080e34 am cde91b3e: am 0adc6431: am c550cd45: am fa97fe67: Merge "Pick gnu-libstdc++ based on TARGET_GCC_VERSION"
* commit 'cde91b3e6a42e66cb45e75eb69111f37840dffec':
  Pick gnu-libstdc++ based on TARGET_GCC_VERSION
2014-03-25 03:34:29 +00:00
Andrew Hsieh
0adc643104 am c550cd45: am fa97fe67: Merge "Pick gnu-libstdc++ based on TARGET_GCC_VERSION"
* commit 'c550cd45536c7153726c502886bf32797e997dd3':
  Pick gnu-libstdc++ based on TARGET_GCC_VERSION
2014-03-25 02:54:46 +00:00
Tim Murray
02cefc93a8 Make Clang host builds hermetic on Linux.
This lays the groundwork for making builds hermetic on Darwin as well.
That will be fixed in a future patch.

bug 13435344

Change-Id: Iae82d0b9efad0598d682ff5fd4daa737aa607866
2014-03-24 19:38:47 -07:00
Andrew Hsieh
92d50c1a10 Pick gnu-libstdc++ based on TARGET_GCC_VERSION
Previously we have only one set of include/lib paths for
LOCAL_NDK_STL_VARIANT:=gnustl_static regardless of GCC
version, which is wrong because each GCC version
come with its own libstdc++.

Change-Id: I2a01c2120b6948aedce00e2f8d08dfc6932126dd
2014-03-25 09:46:27 +08:00
Colin Cross
966c9194a6 remove libeffects from 64-bit blacklist
Everything under frameworks/av/media/libeffects compiles fine for
64-bit

Change-Id: I03519a98903b7d65936053ef7eda8926cce60ea0
2014-03-24 18:40:11 -07:00
Ying Wang
266cf4f259 am f39752e9: Skip the product-scoped --product flag if it\'s set in LOCAL_AAPT_FLAGS
* commit 'f39752e99b4e5083f1e91c46722f87def8143b49':
  Skip the product-scoped --product flag if it's set in LOCAL_AAPT_FLAGS
2014-03-24 21:21:26 +00:00
Ying Wang
595f996f0d am 7a93f683: am 82a2ae71: am 5a4c783c: am 8c60a1df: Merge "Complete installed shared library dependency"
* commit '7a93f68322eca5ccf32ca9544ba63ec64548e050':
  Complete installed shared library dependency
2014-03-24 19:36:32 +00:00
Ying Wang
82a2ae714c am 5a4c783c: am 8c60a1df: Merge "Complete installed shared library dependency"
* commit '5a4c783c2d960a4ab76b4cdd57933e31dbfe6211':
  Complete installed shared library dependency
2014-03-22 00:03:34 +00:00
Ying Wang
d8d3721240 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
2014-03-21 16:17:04 -07:00
Narayan Kamath
9c2daa97e1 Merge "Add warning message for java6 builds." 2014-03-21 10:43:49 +00:00
Ying Wang
f39752e99b Skip the product-scoped --product flag if it's set in LOCAL_AAPT_FLAGS
Bug: 11335547
Change-Id: Ic08b7557a288508e8e8d14a725923960c47f5ca0
2014-03-20 17:28:57 -07: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