aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Snap for 5860054 from 7520071f4098eb8ffa73b278779a7b0018dc5e00 to ↵android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-build-team Robot2019-09-071-1/+2
|\ | | | | | | | | | | qt-qpr1-release Change-Id: I87222c32fbd8fdb147e9295e5bd5af9c93d8b254
| * Add NOTICE file path to apex bundle base rule. am: 105e166581android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4Jaewoong Jung2019-09-051-1/+2
| |\ | | | | | | | | | | | | | | | am: 8f6b0708b6 Change-Id: I28210c97380616652005f8d722478d431ff0f9d4
| | * Add NOTICE file path to apex bundle base rule.Jaewoong Jung2019-09-051-1/+2
| | |\ | | | | | | | | | | | | | | | | | | | | am: 105e166581 Change-Id: I8accb39ebc3caea8891f62a2b4ca0cd2cfc13c82
| | | * Add NOTICE file path to apex bundle base rule.Jaewoong Jung2019-09-041-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The NOTICE files are missing from prebuilt apexes, and it turns out they were excluded when building bundles. Bug: 140317706 Test: Ran build_mainline_modules.sh and checked bundle base modules. Change-Id: I92c4231f2007e1d8cd9c2bd044201458803c0fd7
* | | | Snap for 5811135 from d5bd6d36768200e9085c2406cdde718f0b0c72aa to ↵android-build-team Robot2019-08-175-99/+125
|\| | | | | | | | | | | | | | | | | | | | | | | qt-qpr1-release Change-Id: I862c7d512b3e214454c8b6008d9eca1582fd39ba
| * | | Fix sanitizer depJiyong Park2019-08-164-90/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change fixes a problem in sanitizerMutator where a module is linked with of non-sanitized variant of a lib at build-time, but is linked with the sanitized variant of the lib at run-time. This happened because, for each sanitizer type, every shared libs are split into non-sanitized and sanitized variants, and then either of the variants are suppressed from Make so that it isn't installed to the device. This change fixes the problem by NOT splitting for shared libs; only the sanitized variant is created if needed. Header libs, static libs and shared libs for a few sanitizer types (asan/fuzzer) are however split into two. This is because the static and headers libs become part of the depending module, and asan/fuzzer require that the depending module and the dependant module should be compiled for the same sanitizer. Bug: 138103882 Bug: 138426065 Test: m com.android.runtime.debug Check that libziparchive exists under both /system/apex/com.android.runtime/[lib|lib64] Merged-In: Ia447785c485c0d049e19477b32bc638bfe6f1608 (cherry picked from commit 1d1119f4bd20368dc686c6980d80a3ea34311716) Change-Id: Ia447785c485c0d049e19477b32bc638bfe6f1608
| * | | Merge "API: Add baseline file for API check" into qt-dev am: 5961cb4598Adrian Roos2019-08-151-9/+33
| |\| | | | | | | | | | | | | | | | | | | | | | am: 6b56b1171a Change-Id: I8acd9ec4b81444b13d73b208b21bcbc89decc195
| | * | Merge "API: Add baseline file for API check" into qt-devAdrian Roos2019-08-151-9/+33
| | |\| | | | | | | | | | | | | | | | | | | | | am: 5961cb4598 Change-Id: I986820330843ed71e72a7ac55f6494c09c302118
| | | * Merge "API: Add baseline file for API check" into qt-devTreeHugger Robot2019-08-151-9/+33
| | | |\
| | | | * API: Add baseline file for API checkAdrian Roos2019-08-131-9/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 139128921 Test: m apicheck Change-Id: Ia10c51fdca10e2a3d1cc3a7bc6d798d447c7b729 Merged-In: Ia10c51fdca10e2a3d1cc3a7bc6d798d447c7b729
* | | | | Snap for 5787825 from 1e8fd726dd17e0a5323560e001be6ab989869add to ↵android-build-team Robot2019-08-081-0/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-qpr1-release Change-Id: I0cb9dbc70140dccc2b749c8c9f9ba5bbdc6624e6
| * | | | Build module from source branch instead of using prebuilds when coverage is ↵Kun Niu2019-08-071-0/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enabled. am: 1bc40c56b9 am: 97f3652c7b Change-Id: If7edb76d90d3e14609765b04a21da5509e90cb03
| | * | | Build module from source branch instead of using prebuilds when coverage is ↵Kun Niu2019-08-071-0/+4
| |/| | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | enabled. am: 1bc40c56b9 Change-Id: I09e1fc90455f350128ca8a70702199c12ed3264c
| | * | Build module from source branch instead of using prebuilds when coverage is ↵Kun Niu2019-08-051-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enabled. Test: successfully get coverage data from coverage build. Bug: 137865099 Change-Id: I7df96c2b2c2ec2859393fb2c19ffe1081d112c96 Merged-In: I7df96c2b2c2ec2859393fb2c19ffe1081d112c96
* | | | Snap for 5736389 from eeebdfc6132f75e7f2f0a5e354bdf429c61fba7d to ↵android-build-team Robot2019-07-181-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | qt-qpr1-release Change-Id: Ifa9b07fa37afb4d7c9f75621f124e30a14545ad2
| * | | fix: APEX prebuilts are disabled in platform buildJiyong Park2019-07-161-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | am: 895e224d8f Change-Id: Iea80d77c2c64bc4dd8ac008e7f0927b65139bb16
| | * | fix: APEX prebuilts are disabled in platform buildJiyong Park2019-07-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change fixes a bug that APEX prebuilts are auto-disabled in platform builds (i.e. non-unbundled builds). Bug: 137282010 Test: m com.android.conscrypt check that the apex is from prebuilt directory Change-Id: I935ef3896e80864bdcc1ca5f6fc12b63c9588c0d
* | | | Snap for 5733681 from a0b5690cb885cb87d571dc13864712a027f6b4c2 to ↵android-build-team Robot2019-07-174-14/+20
|\| | | | | | | | | | | | | | | | | | | | | | | qt-qpr1-release Change-Id: Ie1566d31fa4fa5385ec1d3e2b75b4301079b464d
| * | | Merge changes I2c00af07,I2f49fa7d into qt-devJiyong Park2019-07-164-14/+20
| |\| | | | | | | | | | | | | | | | | | | | | | am: 7610ba915c Change-Id: I17ca6fb856a9c04cac0651934eb19b7939c6b00e
| | * | Merge changes I2c00af07,I2f49fa7d into qt-devTreeHugger Robot2019-07-164-14/+20
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Fix the unbundled mainline module build Revert "Don't build hiddenapi flags or encode dex for unbundled builds"
| | | * | Fix the unbundled mainline module buildJiyong Park2019-07-153-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change fixes two problems: 1) the prebuilt apexes are force disabled for the unbundled builds because we need to build the modules from the source then 2) the dependencies from an sdk_library module to *.stubs.{public|system|tests} are not added for the unbundled build because the stubs modules are disabled. Bug: 137282010 Test: unbundled mainline builds are successful Test: build com.android.media and inspect the jar file to see if hiddenapi flags are there $ cd out/dist/mainline_modules_arm $ unzip com.android.media.apex apex_payload.img $ mkdir -p mnt $ sudo mount -o ro,loop apex_payload.img mnt $ dexdump2 mnt/javalib/updatable-media.jar | grep hiddenapi shows results Merged-In: I2c00af07aac4a15770d3acab011a36e2e4803bfc Change-Id: I2c00af07aac4a15770d3acab011a36e2e4803bfc
| | | * | Revert "Don't build hiddenapi flags or encode dex for unbundled builds"Jiyong Park2019-07-152-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7b8a567f44b3fdb30eac8211e8ed8e27fb162797. Bug: 137282010 Test: With the CL above this one, the unbundled mainline module build does not fail. Merged-In: I2f49fa7dbe1da92cb282a9bc14acd5830888ed17 Change-Id: I2f49fa7dbe1da92cb282a9bc14acd5830888ed17
* | | | | Snap for 5730547 from b942bd8030c83d4e1edd40e41d703e93c0bbae1e to ↵android-build-team Robot2019-07-162-31/+61
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-qpr1-release Change-Id: Ie3d9ce9a16081754756f9aeab1d3bd97411fb98a
| * | | | Support require_root in auto-gen test configsDan Shi2019-07-152-31/+61
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 40c0afeb7c Change-Id: Icfdb4e7517948722f90af17dca4b41aa0840b86f
| | * | | Support require_root in auto-gen test configsDan Shi2019-07-152-31/+61
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | require_root is added to allow auto-generated test config to include RootTargetPreparer so the test runs with root permission. Bug: 134509111 Bug: 136633978 Test: add "require_root: true" to init_benchmarks and libpower_test build the modules, confirm the extra target preparer is added in the test configs. Change-Id: Ia07503e338935d6aa92560e7cf7b18d2a4c51243 Merged-In: Ia07503e338935d6aa92560e7cf7b18d2a4c51243
* | | | Snap for 5726885 from c835e6c66d40f21247a2935b887caec7473567e0 to ↵android-build-team Robot2019-07-131-4/+10
|\| | | | | | | | | | | | | | | | | | | | | | | qt-qpr1-release Change-Id: I242556973555c7db13ad35a8017a89331669d4b5
| * | | Don't use APEX prebuilts when asan is onJiyong Park2019-07-111-4/+10
| |\| | | | | | | | | | | | | | | | | | | | | | am: 3b98a509f1 Change-Id: I65e29cfe0ccad3a9ba9253d0ebc7c0d3c04a369c
| | * | Don't use APEX prebuilts when asan is onJiyong Park2019-07-111-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some prebuilt APEXes are enabled with scudo, which causes crash on devices with asan. Bug: 137216042 Test: build walleye_hwasan and check if apexes are not from prebuilts Change-Id: Ic436ad06e724af952d99fb8e66358a595450eb84
* | | | Snap for 5719381 from 3c8fd299a04914b293954b1f1a95f24398dc1781 to ↵android-build-team Robot2019-07-112-1/+18
|\| | | | | | | | | | | | | | | | | | | | | | | qt-qpr1-release Change-Id: I8efd4ebf8fe855d272996242c554153269c99669
| * | | Don't use prebuilt_apex when TARGET_FLATTEN_APEX is set to trueJiyong Park2019-07-092-1/+18
| |\| | | | | | | | | | | | | | | | | | | | | | am: 0a573d798f Change-Id: I9d9f43f0af50102fa594698829426b7155b32eac
| | * | Don't use prebuilt_apex when TARGET_FLATTEN_APEX is set to trueJiyong Park2019-07-072-1/+18
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the device does not support non-flattened APEX (i.e. TARGET_FLATTEN_APEX is set to true), then ignore the prebuilt_apex modules even when `prefer: true`. Bug: 136251130 Bug: 136662772 Test: build marlin, and check if /system/apex has flattened APEXes Change-Id: I9f3dfefc3bd357d6750fbb1e418937d095720b04
* | | Snap for 5691478 from f70145ae3b593d76b077ff7d06b77dd8b7caad71 to ↵android-build-team Robot2019-06-2710-58/+388
|\| | | | | | | | | | | | | | | | | qt-qpr1-release Change-Id: If1889bf93d30d62d3766d2347a176567c73468d8
| * | Uncompress dex in unbundled privileged appsColin Cross2019-06-263-5/+92
| |\| | | | | | | | | | | | | | | | am: 43377eeb38 Change-Id: Idbca7ddd6fc9beca844934761ac6d5ecced5a472
| | * Uncompress dex in unbundled privileged appsColin Cross2019-06-253-5/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mainline builds privileged apps unbundled and then uses them as prebuilts, so they need to respect the privileged flag when deciding whether or not to uncompress the dex. Bug: 135772877 Test: TestUncompressDex Change-Id: I91da7116b779ae35c0617ef77dbcb9788902370c Merged-In: I91da7116b779ae35c0617ef77dbcb9788902370c (cherry picked from commit 53a87f523b75f86008c3e0971489a06a6450a670)
| * | Embed NOTICE output as an APEX asset.Jaewoong Jung2019-06-262-14/+21
| |\| | | | | | | | | | | | | | | | am: d6585fe6e3 Change-Id: I9f410db71b458add4181023e400359763e208842
| | * Embed NOTICE output as an APEX asset.Jaewoong Jung2019-06-252-14/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of outputting an aggregated NOTICE file as an intermediate build resource to allow Make to include it in the final system-wide NOTICE, process and embed it as an asset in the final APEX. This allows us to update the NOTICE contents automatically when an APEX is updated. Fixes: 135218846 Test: Built mainline modules, apex_test.go Change-Id: Ic851b330fe93be1f602907d44ecc7886c3b0171b Merged-In: Ic851b330fe93be1f602907d44ecc7886c3b0171b (cherry picked from commit 14f5ff62c952350a9e2b07d9d07429b9535655de)
| * | Optionally embed NOTICE files in apks.Jaewoong Jung2019-06-269-42/+278
| |\| | | | | | | | | | | | | | | | am: 5c6572e53f Change-Id: I89b2e9ae107078923a9af705a0753ae03eccad72
| | * Optionally embed NOTICE files in apks.Jaewoong Jung2019-06-259-42/+278
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If embed_notices or ALWAYS_EMBED_NOTICES is set, collect NOTICE files from all dependencies of the android_app, merge them with the app's own one (if exists), transform it to HTML, gzip it, and put it as an asset in the final APK output. Bug: 135460391 Test: app_test.go + Built Mainline modules Change-Id: I52d92e2fd19b3f5f396100424665c5cc344190d8 Merged-In: I52d92e2fd19b3f5f396100424665c5cc344190d8 (cherry picked from commit 5b425e2e20c55216c1ed13fcf047b0df33886736)
* | | Snap for 5681502 from 22428d40225f55d9ac9c968fc2044a88db277251 to ↵android-build-team Robot2019-06-221-3/+1
|\| | | | | | | | | | | | | | | | | qt-qpr1-release Change-Id: I4f4c4fe6fc3a261e3c834d84652484a3d84d7789
| * | OverridableModuleBase shouldn't embed ModuleBase.Jaewoong Jung2019-06-201-3/+1
| |\| | | | | | | | | | | | | | | | am: 3ad00bf196 Change-Id: I7da1ad88a84b3118ea175d3aa458e740707ec00b
| | * OverridableModuleBase shouldn't embed ModuleBase.Jaewoong Jung2019-06-191-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Individual module structs normally embed ModuleBase themselves. This caused duplicate embedding, and so made common properties like notice inaccessible. Bug: 135460391 Test: app_test.go, TreeHugger Change-Id: I5683b194e3de909d480c083a931cc7e871de1d74 Merged-In: I5683b194e3de909d480c083a931cc7e871de1d74
* | | Snap for 5663715 from d9c5deb3a7f898c97b9f4a7f6a2d8fd28fc76f97 to ↵android-build-team Robot2019-06-152-16/+1
|\| | | | | | | | | | | | | | | | | qt-qpr1-release Change-Id: I1d66c6da711937a137f4a75a92912579db8c6cd7
| * | Merge "neverallow: vintf to libhidltransport impl lib" into qt-devSteven Moreland2019-06-142-16/+1
| |\| | | | | | | | | | | | | | | | am: 6df90831b7 Change-Id: Ib709b3ccc7adede11bc7d632897b488533fd4f7e
| | * Merge "neverallow: vintf to libhidltransport impl lib" into qt-devSteven Moreland2019-06-142-16/+1
| | |\
| | | * neverallow: vintf to libhidltransport impl libSteven Moreland2019-06-142-16/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also delete useless testcase. Bug: 134961554 Test: build Change-Id: Ie76492f806757b86d94d29a736773f72ce2ab104
* | | | Merge "Snap for 5652667 from a625ce4dc87a80874852ca8c374489afb9ccb8b5 to ↵android-build-team Robot2019-06-120-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | qt-qpr1-release" into qt-qpr1-release
| * | | | Snap for 5652667 from a625ce4dc87a80874852ca8c374489afb9ccb8b5 to ↵android-build-team Robot2019-06-121-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-qpr1-release Change-Id: Icfcc7692efb2fa719b803881adabe4a01e9b43d8
* | | | | Merge "Snap for 5652667 from a625ce4dc87a80874852ca8c374489afb9ccb8b5 to ↵android-build-team Robot2019-06-120-0/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | qt-qpr1-release" into qt-qpr1-release
| * \ \ \ \ Snap for 5652667 from a625ce4dc87a80874852ca8c374489afb9ccb8b5 to ↵android-build-team Robot2019-06-121-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | | | | | | | | | | qt-qpr1-release Change-Id: I6490954e20e40e8a5cb08448b0779aef89f31e18
* | | | | Snap for 5652667 from a625ce4dc87a80874852ca8c374489afb9ccb8b5 to ↵android-build-team Robot2019-06-121-1/+1
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | qt-qpr1-release Change-Id: I7769193d5e2f6d6c7d80e59c268046d022467819