Commit graph

20087 commits

Author SHA1 Message Date
Clay Murphy
37df3be46d am 96a81b18: am fb68db08: Merge "Docs: Making source.android.com headers match those of developer.android.com"
* commit '96a81b18ac1f01760a3ef573289cefdfbc810cb7':
  Docs: Making source.android.com headers match those of developer.android.com
2014-10-09 17:42:47 +00:00
Clay Murphy
96a81b18ac am fb68db08: Merge "Docs: Making source.android.com headers match those of developer.android.com"
* commit 'fb68db08000e2d22461edbfa663e298c672476c0':
  Docs: Making source.android.com headers match those of developer.android.com
2014-10-09 17:38:40 +00:00
Clay Murphy
fb68db0800 Merge "Docs: Making source.android.com headers match those of developer.android.com" 2014-10-09 17:33:27 +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
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
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
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
a01fa4f8a3 Merge "LOCAL_NATIVE_COVERAGE should imply -O0." 2014-10-09 00:56:23 +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
Adam Lesinski
dcfaac5f8e am 811e650b: Merge "Add appops command to devices" into lmp-dev
* commit '811e650b820ffa4f291d18d6f49673314848c810':
  Add appops command to devices
2014-10-08 22:48:46 +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
edb9df24d0 Merge "Check $(built_dex) to determine if we can run dex-preopt." into lmp-dev 2014-10-08 22:25:17 +00: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
Adam Lesinski
811e650b82 Merge "Add appops command to devices" into lmp-dev 2014-10-08 18:03:15 +00:00
Adam Lesinski
02bbd640e7 Add appops command to devices
This is used to set appops permissions from the command line
or from CTS tests via the shell.

Change-Id: I8a71d1398e2071aecfd22be7b6530f186f40c2c0
2014-10-08 10:53:59 -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
1a856098ea Merge "Export build thumbprint only if the product has specified at least one oem fingerprint property" into lmp-dev 2014-10-08 16:33:16 +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
Vince Harron
4f9438ba15 am 3e8b79c2: Merge "Increase system image partition size to fix build" into lmp-dev
* commit '3e8b79c2b3c84b2c6ef7b28903a719b10248e63d':
  Increase system image partition size to fix build
2014-10-07 23:23:18 +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
Vince Harron
3e8b79c2b3 Merge "Increase system image partition size to fix build" into lmp-dev 2014-10-07 23:19:36 +00:00
Vince Harron
c1a9edd7a8 Increase system image partition size to fix build
Build of sdk_google_phone_x86_64-sdk_addon product was failing with
the following error message:

error: ext4_allocate_best_fit_partial: failed to allocate 2420 blocks,
out of space?

Change-Id: Ib9e2d21bac86b12b6f8f75d4f30806dd20abcb90
2014-10-07 15:54:19 -07:00
smain@google.com
8fa6f74a29 am 783d016a: am bc667f1c: am 08f336ea: fix regression from Change-Id: I88c1e8192f1cbb5373af592b9e9f9a04ffe6fc7c that causes anchors in most docs other than reference to stop working
* commit '783d016a27ea342ad6445720026a14e89ae1c78c':
  fix regression from Change-Id: I88c1e8192f1cbb5373af592b9e9f9a04ffe6fc7c that causes anchors in most docs other than reference to stop working
2014-10-07 22:32:12 +00:00
smain@google.com
51c6bc55c9 am 4247c940: am f4cefc19: am 633f322b: update the analytics tracking event calls to use new API for analytics.js bug: 16331906
* commit '4247c940d45318f5553138fd37f13f85f2854c6a':
  update the analytics tracking event calls to use new API for analytics.js bug: 16331906
2014-10-07 22:32:11 +00:00
smain@google.com
783d016a27 am bc667f1c: am 08f336ea: fix regression from Change-Id: I88c1e8192f1cbb5373af592b9e9f9a04ffe6fc7c that causes anchors in most docs other than reference to stop working
* commit 'bc667f1cd7d852909a9a3893473f29dc7b000b2f':
  fix regression from Change-Id: I88c1e8192f1cbb5373af592b9e9f9a04ffe6fc7c that causes anchors in most docs other than reference to stop working
2014-10-07 22:23:35 +00:00
smain@google.com
4247c940d4 am f4cefc19: am 633f322b: update the analytics tracking event calls to use new API for analytics.js bug: 16331906
* commit 'f4cefc19e87eae62b6f2f8cc40b154f9fbe4b3de':
  update the analytics tracking event calls to use new API for analytics.js bug: 16331906
2014-10-07 22:23:19 +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
8330c4c5e6 Merge "Apply LOCAL_CXX_STL to also prebuilts." 2014-10-07 21:11:30 +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
Nicolas Geoffray
888bd7d4ab am cb2ee3ef: am 9bf56c5e: Merge "Fix typo."
* commit 'cb2ee3ef637e47da63dcdb1d60c55709820789e7':
  Fix typo.
2014-10-07 10:28:18 +00:00
Nicolas Geoffray
cb2ee3ef63 am 9bf56c5e: Merge "Fix typo."
* commit '9bf56c5e911856bc55693f5723a53271147e583e':
  Fix typo.
2014-10-07 10:23:31 +00:00
Nicolas Geoffray
9bf56c5e91 Merge "Fix typo." 2014-10-07 10:19:17 +00:00
Nicolas Geoffray
4c0c390f30 Fix typo.
Change-Id: I738ad878a2961d118b5a89bf7d434606df2fad92
2014-10-07 11:17:09 +01: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
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
Dan Albert
b6361968f8 Merge "Remove unused my_compiler_dependencies." 2014-10-06 18:33:42 +00:00
Dan Albert
a8fd66822a Remove unused my_compiler_dependencies.
my_compiler_dependencies was never assigned to, but the way it was
included in the rules prevented the user from being able to use | in
LOCAL_ADDITIONAL_DEPENDENCIES. Since it is unneeded, just remove it.

Change-Id: I74bb59e81b97756296060eea5b7a42909be50130
2014-10-06 10:45:44 -07:00
Dan Albert
ec1b90f81f Stash original values of CC and CXX.
This way we can still access the real compiler as opposed to a wrapped
one.

Change-Id: I17ba30416a3eb8eda056c67faaa8b5957e70caea
2014-10-06 10:43:29 -07:00
Christopher Ferris
7052c570fd am 397a8be4: Merge "Call art-on only when debugging ART processes." into lmp-dev
* commit '397a8be4bc26a696cf205ac9800865caee3ecf61':
  Call art-on only when debugging ART processes.
2014-10-05 19:23:00 +00:00
Christopher Ferris
397a8be4bc Merge "Call art-on only when debugging ART processes." into lmp-dev 2014-10-05 19:19:57 +00:00