Commit Graph

6592 Commits

Author SHA1 Message Date
Ying Wang
f1794738b1 Merge "Introduce per-product per-module dex-preopt config" 2014-10-10 02:13:10 +00:00
Raphael Moll
a4d1f6a7f0 SDK Addon multi-sys-img support.
Fix an issue where the add-on system images have 2 extra
inner folders. The sole root folder in the zip file should
be the ABI one.

Change-Id: Ie12b913438e2b1113d34222e467ff280daa23c7f
2014-10-10 00:50:39 +00:00
Narayan Kamath
f7fa256321 am 75635a16: am aec004e6: resolved conflicts for merge of 1a856098 to lmp-mr1-dev
* commit '75635a1689da4b535f7cca9ff997adfe9a76c7e0':
  Export build thumbprint only if the product has specified at least one oem fingerprint property
2014-10-09 22:31:07 +00:00
Narayan Kamath
75635a1689 am aec004e6: resolved conflicts for merge of 1a856098 to lmp-mr1-dev
* commit 'aec004e66c5b6bdb11e92a4acd329653128fa216':
  Export build thumbprint only if the product has specified at least one oem fingerprint property
2014-10-09 22:23:42 +00:00
Chih-Hung Hsieh
bdd425b036 am a45c1ea2: am 8913e282: am 29373be8: Merge "Add -fPIC as default Clang mips ASFLAGS."
* commit 'a45c1ea2a8f921aad4238f8b4d4edf53a68380f2':
  Add -fPIC as default Clang mips ASFLAGS.
2014-10-09 17:28:53 +00:00
Chih-Hung Hsieh
25756c1422 am 8913e282: am 29373be8: Merge "Add -fPIC as default Clang mips ASFLAGS."
* commit '8913e28295a9f93121fa60f74a6ff39eadd2e86d':
  Add -fPIC as default Clang mips ASFLAGS.
2014-10-09 17:24:37 +00:00
Chih-Hung Hsieh
a45c1ea2a8 am 8913e282: am 29373be8: Merge "Add -fPIC as default Clang mips ASFLAGS."
* commit '8913e28295a9f93121fa60f74a6ff39eadd2e86d':
  Add -fPIC as default Clang mips ASFLAGS.
2014-10-09 17:24:33 +00:00
Chih-Hung Hsieh
8913e28295 am 29373be8: Merge "Add -fPIC as default Clang mips ASFLAGS."
* commit '29373be81de4d6e8817434b146c395b2a28e4628':
  Add -fPIC as default Clang mips ASFLAGS.
2014-10-09 17:20:01 +00:00
Chih-Hung Hsieh
29373be81d Merge "Add -fPIC as default Clang mips ASFLAGS." 2014-10-09 17:17:08 +00:00
Ying Wang
36cff2a996 am edb9df24: Merge "Check to determine if we can run dex-preopt." into lmp-dev
* commit 'edb9df24d00091a5206ba36d7f32ed75d6c462b9':
  Check $(built_dex) to determine if we can run dex-preopt.
2014-10-09 16:57:16 +00:00
Narayan Kamath
aec004e66c resolved conflicts for merge of 1a856098 to lmp-mr1-dev
Change-Id: Id2ef023078a251cc58450d457f5b20261e2851a3
2014-10-09 13:58:05 +01:00
Dan Albert
0bb86c0c44 am 358d9c0d: am 24c1d149: am a01fa4f8: Merge "LOCAL_NATIVE_COVERAGE should imply -O0."
* commit '358d9c0d698859b959396320f2453468a261fa2c':
  LOCAL_NATIVE_COVERAGE should imply -O0.
2014-10-09 12:44:55 +00:00
Paul Lawrence
22f293416d am c821adde: am a6a04357: fs_mgr is now different on different build types
* commit 'c821adde0e65e5c678d27afa6245090d791c6d5a':
  fs_mgr is now different on different build types
2014-10-09 12:44:38 +00:00
Ying Wang
c206b0671f am edb9df24: Merge "Check to determine if we can run dex-preopt." into lmp-dev
* commit 'edb9df24d00091a5206ba36d7f32ed75d6c462b9':
  Check $(built_dex) to determine if we can run dex-preopt.
2014-10-09 12:34:03 +00:00
Dan Albert
358d9c0d69 am 24c1d149: am a01fa4f8: Merge "LOCAL_NATIVE_COVERAGE should imply -O0."
* commit '24c1d149678dcd03f679bfa0fc29386cee779935':
  LOCAL_NATIVE_COVERAGE should imply -O0.
2014-10-09 01:28:25 +00:00
Dan Albert
6adf02580b am 24c1d149: am a01fa4f8: Merge "LOCAL_NATIVE_COVERAGE should imply -O0."
* commit '24c1d149678dcd03f679bfa0fc29386cee779935':
  LOCAL_NATIVE_COVERAGE should imply -O0.
2014-10-09 01:14:58 +00:00
Dan Albert
24c1d14967 am a01fa4f8: Merge "LOCAL_NATIVE_COVERAGE should imply -O0."
* commit 'a01fa4f8a369580a888317d0ea7f3507f4dcc828':
  LOCAL_NATIVE_COVERAGE should imply -O0.
2014-10-09 01:01:39 +00:00
Dan Albert
4c12c0303c LOCAL_NATIVE_COVERAGE should imply -O0.
Optimization can lead to incorrect coverage results.

Change-Id: I8ade9ab246e292d26ac18821baf9970e29dc1a1f
2014-10-08 17:05:19 -07:00
Paul Lawrence
c821adde0e am a6a04357: fs_mgr is now different on different build types
* commit 'a6a043577059489e01056c9fe5c22976531dea1a':
  fs_mgr is now different on different build types
2014-10-08 23:06:11 +00:00
Chih-Hung Hsieh
ce6300a5db Add -fPIC as default Clang mips ASFLAGS.
For mips target, gcc passes -KPIC to assembler by default,
but clang passes -KPIC only if -fPIC or -fpic is given.

BUG: 17895505
Change-Id: I7803adaf8ad7b40c6473872b67f4e0b4c502b38a
2014-10-08 15:41:29 -07:00
Ying Wang
62fb8a1f55 Check $(built_dex) to determine if we can run dex-preopt.
Change-Id: Icfed37f50671ec041f2cfdcec9175cb094b572fc
2014-10-08 15:23:24 -07:00
Paul Lawrence
a6a0435770 fs_mgr is now different on different build types
This is to enable compile time selection of disable-verity behavior

See https://googleplex-android-review.git.corp.google.com/#/c/563402/

Bug: 17691572
Change-Id: I6d77e39f070f2a753e09e5634cc3d9ebfceccada
2014-10-08 15:05:21 -07:00
Ying Wang
20ebd2ef08 Introduce per-product per-module dex-preopt config
- Added LOCAL_DEX_PREOPT_FLAGS to pass extra flags to dex2oat.
- Added macro add-product-dex-preopt-module-config to specify almost
  arbitrary dex-preopt config/flags to modules in product
  configuration:
  $(call \
  add-product-dex-preopt-module-config,<module_name_list>,<config_or_flags>)
  How <config_or_flags> is interpreted is decided by
  dex_preopt_odex_install.mk and dex2oat. For now if it's "disable" we
  disable dexpreopt for the given modules; otherwise pass it to dex2oat as
  command line flags.
- If there are multiple configs for the same module in the product
  inheritance, the first takes precedence.
- Added PRODUCT_DEX_PREOPT_DEFAULT_FLAGS so you can specify default
  dex2oat flags in product configuration.
- Added PRODUCT_DEX_PREOPT_BOOT_FLAGS to specify flags of building boot.oat.

Bug: 17791867
Change-Id: I1b2955e8e51039e94d1ff43a3265a8d03598632c
2014-10-08 10:11:17 -07:00
Ying Wang
cc9e30ef35 am 1a856098: Merge "Export build thumbprint only if the product has specified at least one oem fingerprint property" into lmp-dev
* commit '1a856098ea819a75ad904ff6d6dcfac9545a02a6':
  Export build thumbprint only if the product has specified at least one oem fingerprint property
2014-10-08 16:38:40 +00:00
Ying Wang
e24e17a976 Export build thumbprint only if the product has specified at least one oem fingerprint property
Bug: 17888863
Change-Id: I4d12bc977dcb5e8e1858efb2a395466d8779de34
2014-10-07 18:59:47 -07:00
Ying Wang
230afab744 am e4e50f9b: am 8330c4c5: Merge "Apply LOCAL_CXX_STL to also prebuilts."
* commit 'e4e50f9bb4ae8af11aaddf9825a09ff33241b204':
  Apply LOCAL_CXX_STL to also prebuilts.
2014-10-07 23:23:15 +00:00
Ying Wang
4019305580 am e4e50f9b: am 8330c4c5: Merge "Apply LOCAL_CXX_STL to also prebuilts."
* commit 'e4e50f9bb4ae8af11aaddf9825a09ff33241b204':
  Apply LOCAL_CXX_STL to also prebuilts.
2014-10-07 23:20:51 +00:00
Ying Wang
e4e50f9bb4 am 8330c4c5: Merge "Apply LOCAL_CXX_STL to also prebuilts."
* commit '8330c4c5e6f8bb8b64e1b45ceed603b49853a086':
  Apply LOCAL_CXX_STL to also prebuilts.
2014-10-07 21:15:38 +00:00
Ying Wang
75e8fcbb6c Apply LOCAL_CXX_STL to also prebuilts.
Because LOCAL_CXX_STL modifies a module's required shared libaries,
we need this for also prebuilt shared libraries and executables.

Change-Id: I418c26143999a613c40aadf990f131b123e0ac3d
2014-10-07 13:07:00 -07:00
Ying Wang
7c877395b1 Apply LOCAL_CXX_STL to also prebuilts.
Because LOCAL_CXX_STL modifies a module's required shared libaries,
we need this for also prebuilt shared libraries and executables.

Change-Id: I418c26143999a613c40aadf990f131b123e0ac3d
2014-10-07 13:03:29 -07:00
Nicolas Geoffray
1bd5747937 am 179362ea: am cb2ee3ef: am 9bf56c5e: Merge "Fix typo."
* commit '179362ea0bef23511e7e03b1aad4f52df2a975c5':
  Fix typo.
2014-10-07 10:30:26 +00:00
Nicolas Geoffray
888bd7d4ab am cb2ee3ef: am 9bf56c5e: Merge "Fix typo."
* commit 'cb2ee3ef637e47da63dcdb1d60c55709820789e7':
  Fix typo.
2014-10-07 10:28:18 +00:00
Nicolas Geoffray
179362ea0b am cb2ee3ef: am 9bf56c5e: Merge "Fix typo."
* commit 'cb2ee3ef637e47da63dcdb1d60c55709820789e7':
  Fix typo.
2014-10-07 10:27:26 +00:00
Nicolas Geoffray
cb2ee3ef63 am 9bf56c5e: Merge "Fix typo."
* commit '9bf56c5e911856bc55693f5723a53271147e583e':
  Fix typo.
2014-10-07 10:23:31 +00:00
Nicolas Geoffray
4c0c390f30 Fix typo.
Change-Id: I738ad878a2961d118b5a89bf7d434606df2fad92
2014-10-07 11:17:09 +01:00
Nicolas Geoffray
6f0474f37a am be21d54b: am a6b9e887: am 4af753c1: Merge "Make which dex2oat version to use configurable."
* commit 'be21d54b6e17397afb50701880925e81fe2d1ae4':
  Make which dex2oat version to use configurable.
2014-10-07 09:48:34 +00:00
Nicolas Geoffray
be21d54b6e am a6b9e887: am 4af753c1: Merge "Make which dex2oat version to use configurable."
* commit 'a6b9e887b98152f913f4e6d9f864da00bc1cc21e':
  Make which dex2oat version to use configurable.
2014-10-07 09:44:23 +00:00
Nicolas Geoffray
f3efdfc830 am a6b9e887: am 4af753c1: Merge "Make which dex2oat version to use configurable."
* commit 'a6b9e887b98152f913f4e6d9f864da00bc1cc21e':
  Make which dex2oat version to use configurable.
2014-10-07 09:44:07 +00:00
Nicolas Geoffray
a6b9e887b9 am 4af753c1: Merge "Make which dex2oat version to use configurable."
* commit '4af753c1d1e770419314108ad795b97d17b11380':
  Make which dex2oat version to use configurable.
2014-10-07 09:41:46 +00:00
Nicolas Geoffray
4af753c1d1 Merge "Make which dex2oat version to use configurable." 2014-10-07 09:38:18 +00:00
Nicolas Geoffray
75c08b2118 Make which dex2oat version to use configurable.
Change-Id: Ic13cf6f9dfb117193a5101781945c501d138955c
2014-10-07 08:30:18 +00:00
Dan Albert
462bd5fcb3 am ddbf420d: am a3b31d7b: am 642c81ea: Merge "Stash original values of CC and CXX."
* commit 'ddbf420dae697510ea4d4b91f8082cd1396ccb8d':
  Stash original values of CC and CXX.
2014-10-06 19:31:16 +00:00
Dan Albert
05426031eb am 0c68be8c: resolved conflicts for merge of 55c2adff to lmp-mr1-dev-plus-aosp
* commit '0c68be8c427f978aad8800e64460351cd12506f3':
  Remove unused my_compiler_dependencies.
2014-10-06 19:31:09 +00:00
Dan Albert
ddbf420dae am a3b31d7b: am 642c81ea: Merge "Stash original values of CC and CXX."
* commit 'a3b31d7b83254a644efd12de3de835594124ef65':
  Stash original values of CC and CXX.
2014-10-06 19:28:48 +00:00
Dan Albert
0c68be8c42 resolved conflicts for merge of 55c2adff to lmp-mr1-dev-plus-aosp
Change-Id: Iaa9ac54a065109e877a2f3f88ef740193f97398c
2014-10-06 11:48:44 -07:00
Dan Albert
cb6992b4b4 am a3b31d7b: am 642c81ea: Merge "Stash original values of CC and CXX."
* commit 'a3b31d7b83254a644efd12de3de835594124ef65':
  Stash original values of CC and CXX.
2014-10-06 18:46:03 +00:00
Dan Albert
15cb27748f am 55c2adff: am b6361968: Merge "Remove unused my_compiler_dependencies."
* commit '55c2adfffac9b40992316938699cb36e0818fbbb':
  Remove unused my_compiler_dependencies.
2014-10-06 18:46:02 +00:00
Dan Albert
a3b31d7b83 am 642c81ea: Merge "Stash original values of CC and CXX."
* commit '642c81ea4559836236a38123feec3d8e51d4b9c2':
  Stash original values of CC and CXX.
2014-10-06 18:36:43 +00:00
Dan Albert
55c2adfffa am b6361968: Merge "Remove unused my_compiler_dependencies."
* commit 'b6361968f86a1e96e1cdf5451d62ea35541de1e3':
  Remove unused my_compiler_dependencies.
2014-10-06 18:36:42 +00:00
Dan Albert
642c81ea45 Merge "Stash original values of CC and CXX." 2014-10-06 18:33:59 +00:00