Commit Graph

20996 Commits

Author SHA1 Message Date
Treehugger Robot
678c8de79c Merge changes from topic "no_whitelisting_apex_available" am: b9e4a3fdf4 am: bf4bc941a2
Change-Id: Ife369d5943e70b4d5a6836ca19d514dd1c38d658
2020-04-05 09:51:31 +00:00
Treehugger Robot
bf4bc941a2 Merge changes from topic "no_whitelisting_apex_available" am: b9e4a3fdf4
Change-Id: I333897404cb17d898c086809c7a69ec65f704a9e
2020-04-05 09:31:31 +00:00
Treehugger Robot
b9e4a3fdf4 Merge changes from topic "no_whitelisting_apex_available"
* changes:
  Remove some apex_available whitelist for the adbd APEX
  Make ndk_prebuilt_* be available to any apex
2020-04-05 09:10:47 +00:00
Treehugger Robot
c064ad3476 [automerger skipped] Merge "[soong] new field in Android.bp to request APK signing V4" am: ab768cf54b am: 00713a61d9 -s ours
am skip reason: Change-Id Ie84725a15406f96f65042ea9909460e4eb34d57f with SHA-1 688de9af5d is in history

Change-Id: If0af55d64615bbaea3401643f921bfe8f39bd151
2020-04-05 02:54:22 +00:00
Treehugger Robot
00713a61d9 Merge "[soong] new field in Android.bp to request APK signing V4" am: ab768cf54b
Change-Id: Ic2c64a90919a7b4558fa0873a2d1b80a15033907
2020-04-05 02:33:33 +00:00
Treehugger Robot
ab768cf54b Merge "[soong] new field in Android.bp to request APK signing V4" 2020-04-05 02:14:41 +00:00
Jooyung Han
7e62fbe8e1 Merge "Apex: support codenames for min_sdk_version" into rvc-dev am: 95148f607e
Change-Id: Ib64f83d89dd7adeafa2b42bc81c7dd012fe13ff8
2020-04-05 00:32:30 +00:00
Jooyung Han
95148f607e Merge "Apex: support codenames for min_sdk_version" into rvc-dev 2020-04-05 00:14:37 +00:00
Songchun Fan
17d69e3484 [soong] new field in Android.bp to request APK signing V4
If "v4_signature: true" is set, the v4 signature file,
named [outputApkFile].idsig
will be generated along side the outputApkFile.

Test: m nothing
Test: atest PackageManagerShellCommandIncrementalTest
BUG: 149354175
Change-Id: Ie84725a15406f96f65042ea9909460e4eb34d57f
Merged-In: Ie84725a15406f96f65042ea9909460e4eb34d57f
2020-04-04 12:37:45 -07:00
TreeHugger Robot
8f2c40e7e1 [automerger skipped] Merge "soong_config: bool_variables shortcut" into rvc-dev am: 909eaf5282 -s ours
am skip reason: Change-Id If5455a38433431c7ecbce1e5b32cfbb47f42602a with SHA-1 2b8b89cfa2 is in history

Change-Id: I5c154f09957982fad5eec7a0472c9b97cc83c085
2020-04-03 21:42:32 +00:00
TreeHugger Robot
909eaf5282 Merge "soong_config: bool_variables shortcut" into rvc-dev 2020-04-03 21:27:22 +00:00
Ramy Medhat
87790234e8 Merge "Fix RuleBuilder remoteable actions running in the local pool." am: ff6231920d am: 98e8fb4865
Change-Id: If2fe384a51bdff0fa11ca19bb55ab334107c8b80
2020-04-03 21:10:25 +00:00
Ramy Medhat
98e8fb4865 Merge "Fix RuleBuilder remoteable actions running in the local pool." am: ff6231920d
Change-Id: I5d547d6bb6e6a51963ceecc8b0410197f330b8c9
2020-04-03 20:47:54 +00:00
Ramy Medhat
ff6231920d Merge "Fix RuleBuilder remoteable actions running in the local pool." 2020-04-03 20:28:41 +00:00
Treehugger Robot
4c76d9f9e0 Merge "Minor refactoring to put mock filesystem init closer to tests." am: 3d568ddd34 am: d7be8455c8
Change-Id: Id71e1a5ddc403cffe5262f325ec80835d348b6af
2020-04-03 17:28:28 +00:00
Treehugger Robot
9db9599fdd Merge "Propagate stubs to the SDK for libraries that have them." am: 237690224e am: 77a6c1d43b
Change-Id: I374853e8ef26118e38ba737c90bba3489660728e
2020-04-03 17:28:21 +00:00
Diego Wilson
b49c5a8c17 Merge "Mount soong sandbox chroot as read-only" am: e7190f29de am: 845bf2cbaf
Change-Id: Ic3e66032dd736e1cb7ed6ff80fa107165579ada5
2020-04-03 17:28:04 +00:00
Yi Kong
dd0f0ed31d [automerger skipped] Merge "Add platform-wide sampling PGO option" into rvc-dev am: bc6341b895 -s ours
am skip reason: Change-Id Ie4d1d5ffbd311ba6e268cb94a618f5272be246ef with SHA-1 ceb5b76c91 is in history

Change-Id: Iea372c7499f3c2b3601a82c77b2eb8d87c9102bf
2020-04-03 17:15:50 +00:00
Treehugger Robot
d7be8455c8 Merge "Minor refactoring to put mock filesystem init closer to tests." am: 3d568ddd34
Change-Id: I9068552ac8ee7cabf6e9332aa6fdfa6e15cf6c3d
2020-04-03 17:05:14 +00:00
Treehugger Robot
77a6c1d43b Merge "Propagate stubs to the SDK for libraries that have them." am: 237690224e
Change-Id: I01fb71a31e11ae1491368ed4223dc405cf63fceb
2020-04-03 17:05:08 +00:00
Diego Wilson
845bf2cbaf Merge "Mount soong sandbox chroot as read-only" am: e7190f29de
Change-Id: Ie1cd52246470286e1d0406922725e147571b25d3
2020-04-03 17:05:01 +00:00
Treehugger Robot
3d568ddd34 Merge "Minor refactoring to put mock filesystem init closer to tests." 2020-04-03 17:03:16 +00:00
Treehugger Robot
237690224e Merge "Propagate stubs to the SDK for libraries that have them." 2020-04-03 17:03:12 +00:00
Yi Kong
bc6341b895 Merge "Add platform-wide sampling PGO option" into rvc-dev 2020-04-03 16:52:20 +00:00
Diego Wilson
e7190f29de Merge "Mount soong sandbox chroot as read-only" 2020-04-03 16:42:01 +00:00
Treehugger Robot
1db89454c0 Merge "soong_config: bool_variables shortcut" am: 4066e5e882 am: 284189078e
Change-Id: Icea361b235fbebc37b753214d13ca12d5c30d9a4
2020-04-03 16:24:06 +00:00
Dan Willemsen
1934adc077 soong_config: bool_variables shortcut
Using a lot of boolean variables can become very verbose without adding
really any new information:

      variables: ["a", "b", "c"],
  }

  soong_config_bool_variable {
      name: "a",
  }

  soong_config_bool_variable {
      name: "b",
  }

  soong_config_bool_variable {
      name: "c",
  }

Now turns into:

      bool_variables: ["a", "b", "c"],
  }

Bug: 153161144
Test: built-in tests
Change-Id: If5455a38433431c7ecbce1e5b32cfbb47f42602a
Merged-In: If5455a38433431c7ecbce1e5b32cfbb47f42602a
(cherry picked from commit 2b8b89cfa2)
2020-04-03 08:57:41 -07:00
Treehugger Robot
284189078e Merge "soong_config: bool_variables shortcut" am: 4066e5e882
Change-Id: Iebf734960125c3cff9288ee0e5cc0c1e1e3cec81
2020-04-03 15:57:09 +00:00
Treehugger Robot
4066e5e882 Merge "soong_config: bool_variables shortcut" 2020-04-03 15:43:42 +00:00
Vladimir Marko
39ad017ff5 [automerger skipped] Add file with updatable BCP packages to /system/etc/ am: b92ae27ca0 -s ours
am skip reason: Change-Id I21def97ace9081e707910d449943c683189f16cf with SHA-1 205e6c2a15 is in history

Change-Id: I9be111a60833a0ffa2412a9687fdb53bf077d066
2020-04-03 13:57:12 +00:00
David Srbecky
c6643ed9bb [automerger skipped] Distinguish boot images by target rather than arch am: 163bda65fd -s ours
am skip reason: Change-Id Iea73c77367affb074f97a0fc318389417ce537da with SHA-1 c177ebeca9 is in history

Change-Id: I80f91df3c245f23a5ef63e806e34edbef6635bd0
2020-04-03 13:57:10 +00:00
Yi Kong
e6a9e64f70 Add platform-wide sampling PGO option
This causes the compiler to emit some additional debug infomation that
will be used for sampling PGO. These debug infomation will get stripped
so it only affects intermediate files.

Test: build
Bug: 79161490
Bug: 153039105
Change-Id: Ie4d1d5ffbd311ba6e268cb94a618f5272be246ef
Merged-In: Ie4d1d5ffbd311ba6e268cb94a618f5272be246ef
(cherry picked from commit ceb5b76c91)
2020-04-03 12:00:04 +00:00
Vladimir Marko
b92ae27ca0 Add file with updatable BCP packages to /system/etc/
Make `permitted_packages` mandatory for updatable boot class
path jars. Collect the permitted_packages from those jars to
a file installed as /system/etc/updatable_bcp_packages.txt .

(cherry picked from commit 205e6c2a15)

Test: aosp_taimen-userdebug boots.
Test: adb shell cat /system/etc/updatable-bcp-packages
Test: Manual, remove permitted_packages from framework-tethering,
      build fails.
Bug: 151314205
Merged-In: I21def97ace9081e707910d449943c683189f16cf
Change-Id: I68486f0d8d3368636e1a5324321bd0106fbe241a
2020-04-03 11:26:19 +01:00
David Srbecky
163bda65fd Distinguish boot images by target rather than arch
We plan to add boot image variants for host tests.
Distinguishing the variants by arch does not work,
since both host and device can have the same arch.

(cherry picked from commit c177ebeca9)

Test: m
Bug: 152037801
Merged-In: Iea73c77367affb074f97a0fc318389417ce537da
Change-Id: I8b95882bb00cd2fd1f6cfd8a2784f9ebb957eec6
2020-04-03 11:25:13 +01:00
Bill Peckham
84be30c130 [automerger skipped] Merge "Include partition tag in apexkeys.txt." into rvc-dev am: 39ea894335 -s ours
am skip reason: Change-Id Ia07887b34f1aa77dae94ef23610dfef83c1a5849 with SHA-1 fff3f8a3f8 is in history

Change-Id: Ie4f5c5faf5ce6c42be5e7dc0bfcb37db600b7cad
2020-04-03 01:27:19 +00:00
Bill Peckham
39ea894335 Merge "Include partition tag in apexkeys.txt." into rvc-dev 2020-04-03 01:04:50 +00:00
Dan Willemsen
b486c7bcb5 [automerger skipped] Fix long mac test times; only initialize host settings once am: 2071132e99 -s ours
am skip reason: Change-Id I39b2d49739e628e4c11bec4805b25039115d2fd0 with SHA-1 6ba5367a70 is in history

Change-Id: If91abf849731cec73cc8844e144aeb9426c7c0de
2020-04-03 00:47:38 +00:00
Dan Willemsen
2071132e99 Fix long mac test times; only initialize host settings once
It looks like sometime in late February our Mac builds started taking
~10 minutes longer than before. On my local workstation the Soong tests
were taking >25 minutes before completing (likely because I don't have
the older SDKs installed, and we iterate from older to newer to find the
oldest installed SDK).

Most of this time was spend running the `xcrun` tools to interrogate the
system about which Mac SDKs are installed and where the tools are. This
will never change during any build or test, so wrap it all in a
sync.Once so that we only ever call them once.

And remove the macSdkPath variable, which has been unused for years and
no longer works (as we don't allow the use of xcode-select during the
build).

Bug: 153010389
Test: prebuilts/build-tools/build-prebuilts.sh on a Mac
Change-Id: I39b2d49739e628e4c11bec4805b25039115d2fd0
Merged-In: I39b2d49739e628e4c11bec4805b25039115d2fd0
(cherry picked from commit 6ba5367a70)
2020-04-02 14:53:36 -07:00
Martin Stjernholm
adeb088c8b Minor refactoring to put mock filesystem init closer to tests.
Test: m nothing
Change-Id: I39449b52d39d8e4351ff5a193df5804f281a017f
2020-04-02 22:39:12 +01:00
Martin Stjernholm
c5dd4f7c1f Propagate stubs to the SDK for libraries that have them.
Necessary to make the APEX build logic treat the libraries as API
boundaries rather than dependencies to bundle.

The .so files in the snapshots are the compiled stub libraries in this
case. They are strictly speaking redundant since they can be generated
from the .map.txt files in the snapshots, but doing that would require
extending the cc_prebuilt_library(_shared) module types with a full
compiler pass etc, and that would break a lot of assumptions in the cc
package.

Test: m nothing
Test: Create an SDK snapshot with Bionic libs, drop it into a
  master-art tree without bionic/ in it, build ART APEXes, and check
  that the Soong phase completes (specifically no errors about various
  APEX libs requiring libc that is not available to them).
Bug: 152481980
Change-Id: I31b928e6261198b6dd6f6b17196e714f07b64172
2020-04-02 22:39:12 +01:00
Diego Wilson
a22240bf22 Mount soong sandbox chroot as read-only
It's safer to disallow writing to the root filesystem of the sandbox.
Still allow write access to the source, tmp, out and dist directories.

Test: build aosp_cf_x86_64_phone-userdebug
Change-Id: Idf0d3a420669fbf6c3aba24e058f09a314ec6d0e
2020-04-02 18:11:28 +00:00
Bill Peckham
1c610cfed1 Include partition tag in apexkeys.txt.
The partition tag helps merge_target_files.py determine
which apexkeys.txt to select from the framework partial
target files and which to select from the vendor partial
target files. The partition tag is the pysical partition
name, for example, a system_ext module on a device where
system_ext is at system/system_ext has a system
partition tag.

Bug: 138942268
Change-Id: Ia07887b34f1aa77dae94ef23610dfef83c1a5849
Merged-In: Ia07887b34f1aa77dae94ef23610dfef83c1a5849
2020-04-02 17:15:47 +00:00
Jooyung Han
29e91d2121 Apex: support codenames for min_sdk_version
Apex can use codenames like "Q", "R" for its min_sdk_version property.
Also, cc_library can use codenames for its stubs.versions.

Bug: 152655956
Test: vendor/google/build/build_mainline_modules.sh
Change-Id: I077ad7b2ac5d90b4c8708921e43846206f05ba70
2020-04-02 23:26:41 +09:00
Vladimir Marko
e1f9a9e867 Merge "Add file with updatable BCP packages to /system/etc/" am: 1c5d4fe4f7 am: 775e40b448
Change-Id: I15c4547c43a5f68d0cb71421837b24cad4e0afe7
2020-04-02 12:33:59 +00:00
Vladimir Marko
775e40b448 Merge "Add file with updatable BCP packages to /system/etc/" am: 1c5d4fe4f7
Change-Id: Id952bbe191317dd76d77ba3bc8618e699beb5759
2020-04-02 12:09:46 +00:00
Vladimir Marko
1c5d4fe4f7 Merge "Add file with updatable BCP packages to /system/etc/" 2020-04-02 11:42:08 +00:00
Anton Hansson
d1dd0e1bd8 Merge "Remove neverallow rules for framework-mediaprovider" into rvc-dev am: 66e365565f
Change-Id: I87a5a56a61bb65fe46000bc3e42721a522ef08f4
2020-04-02 11:30:09 +00:00
Anton Hansson
66e365565f Merge "Remove neverallow rules for framework-mediaprovider" into rvc-dev 2020-04-02 11:07:17 +00:00
Nicolas Geoffray
28773b7004 Merge "Support secondary arch for host module exports." am: 11a8d879b6 am: 1dd137ab42
Change-Id: Ide0e72efcde9715a728dddae3ac287020572fb33
2020-04-02 08:44:06 +00:00
Nicolas Geoffray
1dd137ab42 Merge "Support secondary arch for host module exports." am: 11a8d879b6
Change-Id: I6904936fe7ba62b6cd292e81096f05240096b9b8
2020-04-02 08:25:39 +00:00