Commit Graph

19863 Commits

Author SHA1 Message Date
Treehugger Robot
8b3d1af5d8 Merge "Turn on the instrumentation by default for the java code in APEXes" am: 1d62b1c536 am: 8e254a5fdb am: e603410046
Change-Id: Iea545940b3e86197b443a1206625c88676d9f1e4
2020-02-14 22:47:14 +00:00
Treehugger Robot
e603410046 Merge "Turn on the instrumentation by default for the java code in APEXes" am: 1d62b1c536 am: 8e254a5fdb
Change-Id: I63da8aa76a557da1af56ee2c9ee4358639bd643b
2020-02-14 22:33:31 +00:00
Treehugger Robot
8e254a5fdb Merge "Turn on the instrumentation by default for the java code in APEXes" am: 1d62b1c536
Change-Id: Iba752fc4929e26106f19d3f260a68bfc033915b1
2020-02-14 22:11:32 +00:00
Treehugger Robot
1d62b1c536 Merge "Turn on the instrumentation by default for the java code in APEXes" 2020-02-14 21:55:40 +00:00
Treehugger Robot
2d37c13b35 Merge "Allow using test_config_template for CTS tests." am: f1366a339e am: 81c9f33aba am: 4dda05ff68
Change-Id: I5b17f39f0e17a9ae5225ecded65a47b5ede8412d
2020-02-14 21:06:55 +00:00
Treehugger Robot
4dda05ff68 Merge "Allow using test_config_template for CTS tests." am: f1366a339e am: 81c9f33aba
Change-Id: I42382ff73e503760797dab46e0d76d49d8ce44fb
2020-02-14 20:47:29 +00:00
Treehugger Robot
81c9f33aba Merge "Allow using test_config_template for CTS tests." am: f1366a339e
Change-Id: Iaa70fdd84927c58b8f677708b0109aec21bcaddb
2020-02-14 20:34:15 +00:00
Treehugger Robot
f1366a339e Merge "Allow using test_config_template for CTS tests." 2020-02-14 20:22:48 +00:00
Ivan Lozano
58ed939a67 Merge "Remove execute-only support." am: d0bf3dbea8 am: 5d1461877d am: 50522fe8b8
Change-Id: I3cb63d6ca2070e296e46bd803fdeca1ea75d78f9
2020-02-14 15:26:59 +00:00
Ivan Lozano
50522fe8b8 Merge "Remove execute-only support." am: d0bf3dbea8 am: 5d1461877d
Change-Id: I24df75a9053b2c90dac04e0dcacf9eac83f0e9bd
2020-02-14 15:10:05 +00:00
Ivan Lozano
5d1461877d Merge "Remove execute-only support." am: d0bf3dbea8
Change-Id: I81aa645e661777cad9ff2b3ef1a20470821713d4
2020-02-14 14:56:52 +00:00
Ivan Lozano
d0bf3dbea8 Merge "Remove execute-only support." 2020-02-14 14:42:49 +00:00
Lorenzo Colitti
e29c21e830 Allow using test_config_template for CTS tests.
Currently, soong will not autogenerate AndroidTest.xml files for
CTS tests. The comment says that this is because they can be used
for test data (in which case, autogenerating an AndroidTest.xml
file would not be correct).

Allow autogeneration of test files in the case that the buid rule
explicitly requests it using a test_config_template. This allows
CTS tests to use test_config_template.

Also remove a TODO that was already addressed by aosp/903934.

Test: patching aosp/1235232 and running "m CtsNetTestCases" results in test config
Change-Id: Ic3450b67c47745af5932edd82452fdf16d937ea7
2020-02-14 18:42:06 +09:00
Treehugger Robot
6a3876a027 Merge "Bump the macOS version to 10.10." am: edb3174967 am: b4ea5e1069 am: b2f0dae04c
Change-Id: I392fd55f63fb01163b581afc798d48efedcd3350
2020-02-14 06:29:19 +00:00
Treehugger Robot
b2f0dae04c Merge "Bump the macOS version to 10.10." am: edb3174967 am: b4ea5e1069
Change-Id: I273fb59ca267dad79390f312de5003e6ce0617e5
2020-02-14 06:08:53 +00:00
Treehugger Robot
b4ea5e1069 Merge "Bump the macOS version to 10.10." am: edb3174967
Change-Id: I992d880fe116b1fc2f1c450e024bbc2299a7f0f8
2020-02-14 05:54:58 +00:00
Treehugger Robot
edb3174967 Merge "Bump the macOS version to 10.10." 2020-02-14 05:40:16 +00:00
Dan Willemsen
7ab31f1a9f Remove empty directories when removing previously installed files am: 46459b08bb am: fa974a0c29 am: 7ed92225b1
Change-Id: I6255fd2d9395bf5230d292b1d6f4f33d98db3df5
2020-02-14 05:30:42 +00:00
Dan Willemsen
7ed92225b1 Remove empty directories when removing previously installed files am: 46459b08bb am: fa974a0c29
Change-Id: I3da06dc45c4a420fb7a79bf4c019d3a3030371fa
2020-02-14 05:18:31 +00:00
Dan Willemsen
fa974a0c29 Remove empty directories when removing previously installed files am: 46459b08bb
Change-Id: Ie68b6b8f37b655fb3e52b2643fd6936007afcd33
2020-02-14 05:05:14 +00:00
Dan Willemsen
46459b08bb Remove empty directories when removing previously installed files
Apparently PackageManager gets confused when the apk disappears, but the
directory still exists.

Test: lunch aosp_arm-eng; m BasicDreams
      <remove BasicDreams from PRODUCT_PACKAGES>
      m nothing
      ls out/target/product/generic/system/app
Change-Id: I486c0ddadde55fad226049d3fb0f09af88117da0
2020-02-13 18:34:22 -08:00
Jeffrey Huang
946f7d4600 Merge "Remove liblog from whitelist" am: 7d8ecd0bc1 am: e7f62e9019 am: 7fc4e23f00
Change-Id: Ib57efd0d3f3e36059edd92a5f9722c4b4623e5fd
2020-02-14 01:30:42 +00:00
Jeffrey Huang
7fc4e23f00 Merge "Remove liblog from whitelist" am: 7d8ecd0bc1 am: e7f62e9019
Change-Id: If6675fef2d119cc94d4cac53b303d656854052b7
2020-02-14 01:14:14 +00:00
Jeffrey Huang
e7f62e9019 Merge "Remove liblog from whitelist" am: 7d8ecd0bc1
Change-Id: I492d7a1dc258bece8e005483e35d72812fc06a7d
2020-02-14 00:57:49 +00:00
Jeffrey Huang
7d8ecd0bc1 Merge "Remove liblog from whitelist" 2020-02-14 00:45:22 +00:00
Elliott Hughes
7622713c8d Bump the macOS version to 10.10.
Android Studio only claims to support macOS 10.10 and later, so we
probably shouldn't bother with anything older either.

Test: treehugger
Change-Id: I478cb52221198d7b7e2247dfbee4cd86d5bbd1a8
2020-02-13 16:23:12 -08:00
Treehugger Robot
cf56a70cd2 Merge "apexDepsMutator is a top-down mutator" am: 680afd7bc7 am: 933fb89a3f am: c798bcde06
Change-Id: I4695d3aa1231ff40d4a6570a0973360ebd9bf01d
2020-02-13 22:59:40 +00:00
Treehugger Robot
59522ce2f3 Merge changes from topic "dex2oat-soong-dep-2" am: c9f9ab89a9 am: d0b12394bc am: 004ad89cdb
Change-Id: Ia96b651b0eb456a970a9fe065babe4d9460a46aa
2020-02-13 22:58:51 +00:00
Treehugger Robot
c798bcde06 Merge "apexDepsMutator is a top-down mutator" am: 680afd7bc7 am: 933fb89a3f
Change-Id: Ib4f0c7f65403670e178d90815da5a57035b1a614
2020-02-13 22:46:04 +00:00
Treehugger Robot
004ad89cdb Merge changes from topic "dex2oat-soong-dep-2" am: c9f9ab89a9 am: d0b12394bc
Change-Id: I63821a6beef6cd70bde7f65e5e7862b8fa48ec84
2020-02-13 22:45:16 +00:00
Treehugger Robot
933fb89a3f Merge "apexDepsMutator is a top-down mutator" am: 680afd7bc7
Change-Id: I531b18b61409e49cfb49b62ab6cdf16d4193b600
2020-02-13 22:33:43 +00:00
Treehugger Robot
d0b12394bc Merge changes from topic "dex2oat-soong-dep-2" am: c9f9ab89a9
Change-Id: I5992bdf9b8dc27766384ff613c22cd6fd41aee54
2020-02-13 22:32:35 +00:00
Treehugger Robot
680afd7bc7 Merge "apexDepsMutator is a top-down mutator" 2020-02-13 22:29:23 +00:00
Jiyong Park
33b6654eea Turn on the instrumentation by default for the java code in APEXes
Bug: 149353192
Test:  DIST_DIR=dist_dir TARGET_BUILD_VARIANT=userdebug
EMMA_INSTRUMENT=true NATIVE_COVERAGE=true
TARGET_BUILD_APPS="com.android.media"
vendor/google/build/build_unbundled_coverage_mainline_module.sh and
check that jacoco-report-classes.jar is created.
Change-Id: I28e3dc82b7913f60b2278126fca255306e48a424
2020-02-14 07:21:56 +09:00
Treehugger Robot
c9f9ab89a9 Merge changes from topic "dex2oat-soong-dep-2"
* changes:
  Do all dexpreoptDisabled checks before registering a dex2oat host dep.
  Pass dexpreopt config structs by reference.
  Reland: Get the dex2oat host tool path from module dependency on the binary module.
  Reland: Move the Once cache for dexpreopt.GlobalConfig into the dexpreopt package.
  Reland: Separate dexpreopt.GlobalSoongConfig to allow independent caching of it.
2020-02-13 22:21:45 +00:00
Chih-hung Hsieh
6b83521f90 Merge "Switch from clang-r370808b to clang-r377782" am: 8744cdffeb am: 1c04724bbd am: b0847994f6
Change-Id: If8aa3a6ad9a294feec95f10921d39291000c3f1e
2020-02-13 22:21:19 +00:00
Chih-hung Hsieh
b0847994f6 Merge "Switch from clang-r370808b to clang-r377782" am: 8744cdffeb am: 1c04724bbd
Change-Id: If1867efc9af0a4c675c0f69862aa3fbc3b8f0c52
2020-02-13 22:11:50 +00:00
Chih-hung Hsieh
1c04724bbd Merge "Switch from clang-r370808b to clang-r377782" am: 8744cdffeb
Change-Id: I406104366acbab55433d2e84baec979acf64d01d
2020-02-13 21:59:34 +00:00
Chih-hung Hsieh
8744cdffeb Merge "Switch from clang-r370808b to clang-r377782" 2020-02-13 21:46:35 +00:00
Jeffrey Huang
f0ae6ccaa7 Remove liblog from whitelist
Bug: 145923087
Test: m -j
Change-Id: Ib1b711c01262ce9466cdd49daa3cc7142376004c
2020-02-13 12:33:39 -08:00
Ivan Lozano
8107b85189 Remove execute-only support.
With kernel support being removed for execute-only memory layouts,
remove support for XOM until there's kernel support again.

This allows us to gain the code-size improvements from
"-z noseparate-code".

Bug: 147300048
Test: Compiled binaries no longer marked XOM by default.
Change-Id: Ie84bdd2ca025e8b14867008291bf9ce143b5e999
2020-02-13 13:50:34 -05:00
Automerger Merge Worker
efad4accb3 Merge "Use precise class loader context for system server jars." am: 394b9b379a am: 1b8156a3cf am: 71010c3e87
Change-Id: I441d52a0d7fcdd0ca90bfe2c71a2f1278d6a030a
2020-02-13 18:01:22 +00:00
Martin Stjernholm
6d415273c0 Do all dexpreoptDisabled checks before registering a dex2oat host dep.
Also disable dexpreopting for host. These are necessary to avoid adding
dependencies on dex2oat in various non-platform builds where they will
break.

Since we cannot assume at least one module enables dexpreopting now,
the two dexpreopt singletons are silently disabled if there has been no
call to dexpreopt.GetGlobalSoongConfig.

Bug: 145934348
Bug: 148312086
Bug: 148319588
Bug: 148690468
Test: m
Test: env OUT_DIR=out-tools prebuilts/build-tools/build-prebuilts.sh
  on the aosp-build-tools branch
Test: build/soong/soong_ui.bash --make-mode static_sdk_tools dist DIST_DIR=out-dist BUILD_HOST_static=1
  on internal (cf b/148312086#comment8)
Test: build/soong/soong_ui.bash --make-mode dist DIST_DIR=out-apps TARGET_BUILD_APPS=Launcher3 TARGET_BUILD_VARIANT=userdebug
  on internal without art/ and external/vixl/ (cf b/148319588)
Change-Id: I240dade7204b87fc2d12181534ab23439eca8b46
2020-02-13 17:46:48 +00:00
Martin Stjernholm
8d80ceeb12 Pass dexpreopt config structs by reference.
Should cut down on a bit of copying, and also required for an upcoming
CL that'll change GetCachedGlobalSoongConfig.

Test: m nothing
Bug: 145934348
Change-Id: I6bed737d9b061b5239cc603ad881f4ccd4312e43
2020-02-13 17:46:48 +00:00
Martin Stjernholm
d90676fdde Reland: Get the dex2oat host tool path from module dependency on the
binary module.

This uses the Once cache for GlobalSoongConfig to propagate the dex2oat
path from a module dependency to the singletons (both the one that
writes out dexpreopt_soong.config and the one that creates the
dexpreopted boot images). Unless dexpreopting is disabled altogether
through DisablePreopt in dexpreopt.config, that means:

- We must ensure at least one module registers a dex2oat tool
  dependency and resolves a GlobalSoongConfig using it, or else the
  singletons fail. That means we litter dex2oat dependencies in java
  modules even when they won't get dexpreopted and hence don't really
  need them.

- We still assume there's at least one java_library or android_app in
  the build.

This relands https://r.android.com/1205730 without changes - the
necessary fixes are in the child CLs.

Bug: 145934348
Test: m
  (check that out/soong/dexpreopt_soong.config points to dex2oatd64)
Test: env USE_DEX2OAT_DEBUG=false m
  (check that out/soong/dexpreopt_soong.config points to dex2oat64)
Test: env OUT_DIR=out-tools prebuilts/build-tools/build-prebuilts.sh
  on the aosp-build-tools branch
Change-Id: I66661711b317d1e4ec434861982919bdde19b575
2020-02-13 17:46:48 +00:00
Martin Stjernholm
40f9f3c061 Reland: Move the Once cache for dexpreopt.GlobalConfig into the
dexpreopt package.

Preparation for a future CL that will need to get the make-written
GlobalConfig from within dexpreopt.

Also rename the Load*Config functions to Parse*Config, since they don't
actually load the config files anymore.

This relands https://r.android.com/1211982.

Bug: 145934348
Test: m
Change-Id: Icb9332a93811d77d2d8b06e983b92501b180a358
2020-02-13 17:46:48 +00:00
Automerger Merge Worker
71010c3e87 Merge "Use precise class loader context for system server jars." am: 394b9b379a am: 1b8156a3cf
Change-Id: I23aed2bf306ee19bfae07e9f0d4ce74cdf0608f7
2020-02-13 17:45:38 +00:00
Automerger Merge Worker
1b8156a3cf Merge "Use precise class loader context for system server jars." am: 394b9b379a
Change-Id: Ie9f00ab2e36189a513131d48fc9defecb31f0d94
2020-02-13 17:25:11 +00:00
Martin Stjernholm
75a48d8ae2 Reland: Separate dexpreopt.GlobalSoongConfig to allow independent
caching of it.

Introduce a Once cache for GlobalSoongConfig to allow it to get binary
tool paths from ordinary module dependencies (coming in a future CL)
that are then reused in singletons.

This relands https://r.android.com/1205729.

Bug: 145934348
Test: m
Change-Id: I039d6e204bee5ddc16d8e2d85057fbec20e326fe
2020-02-13 17:21:13 +00:00
Ulyana Trafimovich
394b9b379a Merge "Use precise class loader context for system server jars." 2020-02-13 17:13:13 +00:00