Commit Graph

34818 Commits

Author SHA1 Message Date
Paul Duffin
cb15e50b24 Merge "Move boot jars package check from make" am: 1eacd95001 am: d4f99cdebf am: 6a20dd5c29 am: d0c7e75f64
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1478639

Change-Id: Iac8ecf4c8910934d0f6ac11113bc8106f35a31b7
2020-10-30 12:04:31 +00:00
Paul Duffin
d0c7e75f64 Merge "Move boot jars package check from make" am: 1eacd95001 am: d4f99cdebf am: 6a20dd5c29
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1478639

Change-Id: Ic4c46d9e2c4b8dbf0ed48b964c9c932a62f84593
2020-10-30 11:49:34 +00:00
Paul Duffin
6a20dd5c29 Merge "Move boot jars package check from make" am: 1eacd95001 am: d4f99cdebf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1478639

Change-Id: I5c97775e72ade37d8f1b9462592b8bf72f3427f9
2020-10-30 11:14:53 +00:00
Jingwen Chen
ddc74e50d6 java compilation: refactor and extract javac flag computation into a am: 9cb8d1b37b am: 76d6f9be1c am: 63e2704c6a am: c54138f858
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1480607

Change-Id: I29d3af3cf2372ea3e55f2b627f0a00d04e00eb67
2020-10-30 11:04:46 +00:00
Paul Duffin
d4f99cdebf Merge "Move boot jars package check from make" am: 1eacd95001
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1478639

Change-Id: If9d9a03ccfc47a4c4536b661d47a1589033e55e1
2020-10-30 10:41:52 +00:00
Jingwen Chen
c54138f858 java compilation: refactor and extract javac flag computation into a am: 9cb8d1b37b am: 76d6f9be1c am: 63e2704c6a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1480607

Change-Id: I8d8d0462ddd070a479802c6638e705af3600f46b
2020-10-30 10:37:03 +00:00
Paul Duffin
1eacd95001 Merge "Move boot jars package check from make" 2020-10-30 10:06:46 +00:00
Jingwen Chen
63e2704c6a java compilation: refactor and extract javac flag computation into a am: 9cb8d1b37b am: 76d6f9be1c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1480607

Change-Id: I49279ee00442f35823ac56a3ad71f44da760e036
2020-10-30 10:02:58 +00:00
Jingwen Chen
76d6f9be1c java compilation: refactor and extract javac flag computation into a am: 9cb8d1b37b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1480607

Change-Id: Ic5cce06e89303d16ebb55bc2c923f354b908d481
2020-10-30 09:42:01 +00:00
Jingwen Chen
9cb8d1b37b java compilation: refactor and extract javac flag computation into a
separate function.

This cleans up the internal wiring for a follow-up --patch-module
functionality change.

Bug: 150878007
Test: m
Change-Id: Ie7d9c2b1ad40e055da8a53d632510bef408fc7d2
2020-10-30 00:55:58 -04:00
Zach Johnson
ed98739684 Merge "Add system/bt to Rust allowed paths." am: 6e64c2fe65 am: 5c97c6b37e am: 50569cb842 am: a987dfff51
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1478362

Change-Id: Ieeae7f463334cb04af5b47e9658654e2507d5395
2020-10-30 00:58:40 +00:00
Zach Johnson
a987dfff51 Merge "Add system/bt to Rust allowed paths." am: 6e64c2fe65 am: 5c97c6b37e am: 50569cb842
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1478362

Change-Id: Iab7d13c57d266984020a4d0dabdb839c45f046fc
2020-10-30 00:40:59 +00:00
Zach Johnson
50569cb842 Merge "Add system/bt to Rust allowed paths." am: 6e64c2fe65 am: 5c97c6b37e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1478362

Change-Id: I131af5812ac1f95ddc915aa6fe05aa1bab795500
2020-10-30 00:02:31 +00:00
Zach Johnson
5c97c6b37e Merge "Add system/bt to Rust allowed paths." am: 6e64c2fe65
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1478362

Change-Id: I20e503c12fd126aa1daebae1d4e0ba09373fef35
2020-10-29 23:34:38 +00:00
Nikita Ioffe
6e304e7c80 [automerger skipped] Merge "Update apex/allowed_deps.txt" am: e3fbadcfee am: 6b4de0a3a3 am: 98c7f76643 am: cdd46874be -s ours
am skip reason: Change-Id Id239ea9b31ce23f045f0db4027db33658ef3da14 with SHA-1 8d6ba89094 is in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1479297

Change-Id: I7275863ce893768c900206f348fdd700328ecf46
2020-10-29 23:29:17 +00:00
Zach Johnson
6e64c2fe65 Merge "Add system/bt to Rust allowed paths." 2020-10-29 23:20:30 +00:00
Nikita Ioffe
cdd46874be Merge "Update apex/allowed_deps.txt" am: e3fbadcfee am: 6b4de0a3a3 am: 98c7f76643
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1479297

Change-Id: I2565261facf614c80e7c75e66723152ce1e981ed
2020-10-29 23:12:35 +00:00
Nikita Ioffe
98c7f76643 Merge "Update apex/allowed_deps.txt" am: e3fbadcfee am: 6b4de0a3a3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1479297

Change-Id: If04b53f8bf5da1233db637dd6f33b6362c121fe9
2020-10-29 22:37:44 +00:00
Martin Stjernholm
d20191c8e1 Merge "Disable sanitizer flags and output files for sanitizer-enabled SDK members." am: 3a456b606e am: 886c71928d am: e72f815fb6 am: 452a3ff5f1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1479299

Change-Id: Id7034f09fe34f79eb5b52f400b773f4c462c64b5
2020-10-29 22:02:39 +00:00
Nikita Ioffe
6b4de0a3a3 Merge "Update apex/allowed_deps.txt" am: e3fbadcfee
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1479297

Change-Id: I4f05d272aea58290bbe31d1687a835d4c337b70e
2020-10-29 22:01:38 +00:00
Martin Stjernholm
452a3ff5f1 Merge "Disable sanitizer flags and output files for sanitizer-enabled SDK members." am: 3a456b606e am: 886c71928d am: e72f815fb6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1479299

Change-Id: I20446e38d8ca238b4c995558acd8e2e0ff4090c1
2020-10-29 21:48:03 +00:00
Nikita Ioffe
e3fbadcfee Merge "Update apex/allowed_deps.txt" 2020-10-29 21:46:54 +00:00
Martin Stjernholm
e72f815fb6 Merge "Disable sanitizer flags and output files for sanitizer-enabled SDK members." am: 3a456b606e am: 886c71928d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1479299

Change-Id: I42a881741e2a2dd1b18435f8b4f381dc0ce91560
2020-10-29 21:15:58 +00:00
Martin Stjernholm
886c71928d Merge "Disable sanitizer flags and output files for sanitizer-enabled SDK members." am: 3a456b606e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1479299

Change-Id: I5687b36ec2957a13f54c67c5d38d6f1f71f8baec
2020-10-29 20:40:14 +00:00
Martin Stjernholm
3a456b606e Merge "Disable sanitizer flags and output files for sanitizer-enabled SDK members." 2020-10-29 20:12:25 +00:00
Ulyana Trafimovich
76d69c3bf2 Merge "Drop "android.hidl.manager" -> "android.hidl.base" dependency from class loader context." am: 42cac12541 am: c8b9f0a679 am: eafca437da am: a42dbeaf29
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1478218

Change-Id: Id8cdd0b682235126cbda3865606c511e2e456eec
2020-10-29 19:17:04 +00:00
Ulyana Trafimovich
8474fa50b1 Merge "Move class loader context definitions to a separate file." am: 810025466f am: 7877e417e2 am: 38c8588022 am: 9435bc4967
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1467823

Change-Id: I444c0783725a1b4aaf0cc2ca6187b3d5fba1951e
2020-10-29 19:16:47 +00:00
Yifan Hong
e33b555abd Merge "Make vendor_ramdisk_available." am: 8452b1a993 am: f03e2cea59 am: b3be5cee56 am: 0b065a797c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1470327

Change-Id: I4ed560b18eeca9e07adce0fba5197eeac2c55073
2020-10-29 19:15:52 +00:00
Ulyana Trafimovich
a42dbeaf29 Merge "Drop "android.hidl.manager" -> "android.hidl.base" dependency from class loader context." am: 42cac12541 am: c8b9f0a679 am: eafca437da
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1478218

Change-Id: I7183438acd6216e15424a9347f625eb7e742cec7
2020-10-29 18:57:24 +00:00
Ulyana Trafimovich
9435bc4967 Merge "Move class loader context definitions to a separate file." am: 810025466f am: 7877e417e2 am: 38c8588022
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1467823

Change-Id: I305cd2f212e6bcb7abd59c2870aa9bdb9f15aeb3
2020-10-29 18:57:14 +00:00
Yifan Hong
0b065a797c Merge "Make vendor_ramdisk_available." am: 8452b1a993 am: f03e2cea59 am: b3be5cee56
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1470327

Change-Id: If51597e043930d46d2cc048fb646893aed3a90ae
2020-10-29 18:56:14 +00:00
Ulyana Trafimovich
eafca437da Merge "Drop "android.hidl.manager" -> "android.hidl.base" dependency from class loader context." am: 42cac12541 am: c8b9f0a679
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1478218

Change-Id: Ia4ba776bb0cfb8cb65c47e4b3d4cd7805f64b98f
2020-10-29 18:22:15 +00:00
Ulyana Trafimovich
38c8588022 Merge "Move class loader context definitions to a separate file." am: 810025466f am: 7877e417e2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1467823

Change-Id: I5cc0cdd2fec2220b9c05b1a3f27c011d8f677142
2020-10-29 18:22:07 +00:00
Yifan Hong
b3be5cee56 Merge "Make vendor_ramdisk_available." am: 8452b1a993 am: f03e2cea59
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1470327

Change-Id: I0b8bb98d3a4c370e1cd3228e2b84476f74812e1f
2020-10-29 18:21:04 +00:00
Qasim Javed
d271ada0c9 Add system/bt to Rust allowed paths.
Test: m nothing

Change-Id: Ie467a622dfdb8aea94a06f5fe20183dc9d149254
2020-10-29 11:18:08 -07:00
Ulyana Trafimovich
c8b9f0a679 Merge "Drop "android.hidl.manager" -> "android.hidl.base" dependency from class loader context." am: 42cac12541
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1478218

Change-Id: I8627c675b7062349303b4255897f17b2f6aa36c9
2020-10-29 17:54:47 +00:00
Ulyana Trafimovich
7877e417e2 Merge "Move class loader context definitions to a separate file." am: 810025466f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1467823

Change-Id: I59107cc4368220544442e514d1a88ba905991a11
2020-10-29 17:54:04 +00:00
Ulyana Trafimovich
42cac12541 Merge "Drop "android.hidl.manager" -> "android.hidl.base" dependency from class loader context." 2020-10-29 17:51:48 +00:00
Ulyana Trafimovich
810025466f Merge "Move class loader context definitions to a separate file." 2020-10-29 17:51:24 +00:00
Yifan Hong
f03e2cea59 Merge "Make vendor_ramdisk_available." am: 8452b1a993
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1470327

Change-Id: Ib1c529af1e4987a554acd1fa1c2efc278a19120c
2020-10-29 17:49:01 +00:00
Ulya Trafimovich
180fecedf0 Drop "android.hidl.manager" -> "android.hidl.base" dependency from class loader context.
This dependency is incorrect and shouldn't exist.
It has been removed in https://r.android.com/1467918

Test: m nothing
Bug: 170710203
Bug: 132357300
Change-Id: If3036437e138b552436f135425e6bd15be043678
2020-10-29 17:47:34 +00:00
Ulya Trafimovich
eb26886c85 Move class loader context definitions to a separate file.
Test: lunch aosp_cf_x86_phone-userdebug && m
Bug: 132357300
Change-Id: I1e7e9db1654d0b835276be1cfa6a8eeffc5e96ee
2020-10-29 17:47:34 +00:00
Paul Duffin
9a89a2a0ea Move boot jars package check from make
Adds a singleton that traverses the module variants finding the ones
that are in the list (updatable and non-updatable) of boot jars and
add a ninja rule to ensure that they only contain packages from an
allowed list.

Replaces a hack that ignored any prebuilt boot jars supplied as dex
file with an equivalent one to ensure that they are still ignored.
A follow up change that switches to checking dex jars will allow the
hack to be removed.

The boot jars check can be strict or lax. If strict then all the boot
jars listed in the configuration must be found, otherwise it will only
check the ones it finds. It is strict by default unless
TARGET_BUILD_UNBUNDLED=true or ALLOW_MISSING_DEPENDENCIES=true.

Moves the script and data file from build/make.

Test: m check-boot-jars - for failing and passing cases
      SKIP_BOOT_JARS_CHECK=true - no check-boot-jars target created
	  ALLOW_MISSING_DEPENDENCIES=true - not strict
	  TARGET_BUILD_UNBUNDLED=true - not strict
      verified manually that apart from path differences the same
      files (same check sum) were checked in both old make checks and
      the new Soong ones
      EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true m check-boot-jars
Bug: 171479578
Change-Id: I9d81d6650ba64fc0d48d2dab4ba5a3ba8dd03dec
2020-10-29 17:20:06 +00:00
Yifan Hong
8452b1a993 Merge "Make vendor_ramdisk_available." 2020-10-29 17:17:29 +00:00
Ulyana Trafimovich
54874ad136 Merge "Move part of logic from construct_context.py to Soong." am: e430ac338a am: bc4e9d5f8a am: a9fa672c56 am: ea8b14a87b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1453038

Change-Id: I95bbb8a843ba46a0a32949a0157f65061a65bde9
2020-10-29 16:01:08 +00:00
Nikita Ioffe
7f17421012 Update apex/allowed_deps.txt
Bug: 171330443
Bug: 171668006
Test: build/soong/scripts/update-apex-allowed-deps.sh
Change-Id: Id239ea9b31ce23f045f0db4027db33658ef3da14
Merged-In: Id239ea9b31ce23f045f0db4027db33658ef3da14
2020-10-29 15:35:01 +00:00
Nikita Ioffe
04ca7a80b7 Merge "Update apex/allowed_deps.txt" 2020-10-29 15:33:57 +00:00
Ulyana Trafimovich
ea8b14a87b Merge "Move part of logic from construct_context.py to Soong." am: e430ac338a am: bc4e9d5f8a am: a9fa672c56
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1453038

Change-Id: Iba90751d6c257933d96e2df88d339159b7951b6e
2020-10-29 15:22:51 +00:00
Ulyana Trafimovich
a9fa672c56 Merge "Move part of logic from construct_context.py to Soong." am: e430ac338a am: bc4e9d5f8a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1453038

Change-Id: I49fd01e1423d1ae2920a41bc3cc4f9ac23cd3ba7
2020-10-29 14:55:09 +00:00
Ulyana Trafimovich
bc4e9d5f8a Merge "Move part of logic from construct_context.py to Soong." am: e430ac338a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1453038

Change-Id: Ifb2dd5406a0706979dd7d814aa31e2893c93a4eb
2020-10-29 14:32:48 +00:00