StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
56,090 Commits 1 Branch 0 Tags
bb30ef3fd3bc9c05da2d01f3fbced2ebbb871af2
Commit Graph

56090 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
bb30ef3fd3 Merge "convert java_import jars with arch variants" am: 7a45d37e62 am: 0050ed2760 am: c70a811766 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1995732

Change-Id: I4a7caa5085dffcfad1b7413582ffcbfd0cd77220
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-04 17:02:11 +00:00
Treehugger Robot
c70a811766 Merge "convert java_import jars with arch variants" am: 7a45d37e62 am: 0050ed2760 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1995732

Change-Id: I0a004c66c061a8042ded2d3821616eba84032ba6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-04 16:46:57 +00:00
Treehugger Robot
0050ed2760 Merge "convert java_import jars with arch variants" am: 7a45d37e62 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1995732

Change-Id: I05420e9a6cff3a8843dd5438b9b73becfaa8698d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-04 16:25:44 +00:00
Treehugger Robot
7a45d37e62 Merge "convert java_import jars with arch variants" 2022-04-04 16:06:55 +00:00
Spandan Das
451c6d461b Merge changes I473731a6,Icb91de93,I5a2edaf4 into tm-dev 
* changes:
  Remove android.safetycenter from framework-permission bcp permitted_packges
  Change permitted_packages check to be per-jar rather than per-apex
  Revert "Relax apex package restriction for T+ jars"
 2022-04-04 14:50:56 +00:00
TreeHugger Robot
9682bb525e [automerger skipped] Merge "Merge Android 12 QPR3 ab/8391262" into stage-aosp-master am: c6affe2f1a -s ours am: e6a6ae1775 -s ours 
am skip reason: Merged-In Ida22f0ccbfc886f741a4c3308027922c47ae0529 with SHA-1 7662640b42 is already in history

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

Change-Id: I1981db46f0930775b1716cc153157036920087e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-03 02:49:01 +00:00
Xin Li
88146d8b13 [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: afb99ffd63 -s ours am: 7accd0dd53 -s ours 
am skip reason: Merged-In Ida22f0ccbfc886f741a4c3308027922c47ae0529 with SHA-1 7662640b42 is already in history

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

Change-Id: I70f7fa46dad971b1cfe5e07c8ca57416b41b2c9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-03 02:47:47 +00:00
TreeHugger Robot
e6a6ae1775 [automerger skipped] Merge "Merge Android 12 QPR3 ab/8391262" into stage-aosp-master am: c6affe2f1a -s ours 
am skip reason: Merged-In Ida22f0ccbfc886f741a4c3308027922c47ae0529 with SHA-1 7662640b42 is already in history

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

Change-Id: I046dd57e45449415492339b4e51e8cd4e6d8e76e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-03 02:25:50 +00:00
Xin Li
7accd0dd53 [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: afb99ffd63 -s ours 
am skip reason: Merged-In Ida22f0ccbfc886f741a4c3308027922c47ae0529 with SHA-1 7662640b42 is already in history

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

Change-Id: I6afdf41b50f3029a194ef40663d3c466f3fa380c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-03 02:24:38 +00:00
TreeHugger Robot
c6affe2f1a Merge "Merge Android 12 QPR3 ab/8391262" into stage-aosp-master 2022-04-03 01:59:54 +00:00
Bob Badour
0a6539dd21 Merge "Revert "Revert "Build notice files from license metadata.""" am: 3aae38d451 am: b0489dec23 am: bf82573d27 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2051564

Change-Id: I0a1a9a0ea0ccd052dbc84cc6b2cce0b128393f63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-02 01:48:21 +00:00
Bob Badour
bf82573d27 Merge "Revert "Revert "Build notice files from license metadata.""" am: 3aae38d451 am: b0489dec23 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2051564

Change-Id: I04b9a1fcfa2714fa3a1db012c59da9950ef82e2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-02 01:28:38 +00:00
Bob Badour
b0489dec23 Merge "Revert "Revert "Build notice files from license metadata.""" am: 3aae38d451 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2051564

Change-Id: I3f2bafea9462d6a6b15bf29884ba64e2353b0627
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-02 01:05:50 +00:00
Bob Badour
3aae38d451 Merge "Revert "Revert "Build notice files from license metadata.""" 2022-04-02 00:43:34 +00:00
Xin Li
afb99ffd63 Merge Android 12 QPR3 ab/8391262 
Bug: 226662282
Merged-In: Ida22f0ccbfc886f741a4c3308027922c47ae0529
Change-Id: I1cc91e6f8db42af9d8ab2ace3b4009ae6a06780d
 2022-04-01 20:31:49 +00:00
Ember Rose
09ba2cc0ab Merge "Rename InvalidNullabilityOverride suppression" am: 1d3b79f78f am: f4d7122237 am: 3739605cea 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2051891

Change-Id: Ie892f9594afc504be62a7a1c19bfda3541f99f49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 18:55:06 +00:00
Ember Rose
3739605cea Merge "Rename InvalidNullabilityOverride suppression" am: 1d3b79f78f am: f4d7122237 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2051891

Change-Id: I1f8600b979b50cda7e6b308744ef7de852ed8df7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 18:27:34 +00:00
Ember Rose
f4d7122237 Merge "Rename InvalidNullabilityOverride suppression" am: 1d3b79f78f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2051891

Change-Id: I79fd62c8ec90e22162c2fad43f4bab225633ecb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 18:11:24 +00:00
Bob Badour
de6a087d2d Revert "Revert "Build notice files from license metadata."" 
This reverts commit 77807b3c27.

Reason for revert: fix and roll forward again

Change-Id: I80c796ca81ecf29df9522babe54d684a0d11b9e6
 2022-04-01 18:00:00 +00:00
Ember Rose
1d3b79f78f Merge "Rename InvalidNullabilityOverride suppression" 2022-04-01 17:53:00 +00:00
Wei Sheng Shih
67c0b63929 Revert "Build notice files from license metadata." am: 77807b3c27 am: 72f9cdb599 am: 6c698e406d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2052565

Change-Id: I7e4f410833a4b8349e476d6fca4b2161c8f254f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 17:26:29 +00:00
Wei Sheng Shih
6c698e406d Revert "Build notice files from license metadata." am: 77807b3c27 am: 72f9cdb599 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2052565

Change-Id: I84665416e2346e11046892f6ccbbcd7cf0468e7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 17:06:12 +00:00
Wei Sheng Shih
72f9cdb599 Revert "Build notice files from license metadata." am: 77807b3c27 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2052565

Change-Id: I2bfa3e361890734d4ad3725c2ec77a473ba6212e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 16:43:52 +00:00
Ember Rose
7c57af39e5 Rename InvalidNullabilityOverride suppression 
Test: N/A
Bug: 227661934
Change-Id: I26fcb5b7de58e8c982054a5a54e3526e0b8be2a2
 2022-04-01 10:38:54 -04:00
Wei Sheng Shih
77807b3c27 Revert "Build notice files from license metadata." 
This reverts commit 43c2dcaef6.

Reason for revert: suspect build break

Bug: 227682036

Test: TARGET_BUILD_VARIANT=userdebug UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true vendor/google/build/mainline_modules_bundles.sh -j97


Change-Id: Ibfb8b4fefc264f52f32ba661c269a9cd625d800a
 2022-04-01 14:10:53 +00:00
Bob Badour
c64d309ce2 Fix breakage: bad path join using '/' literal am: 2a5c090c31 am: cf96d25b3d am: ec84245e25 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2052015

Change-Id: I5e8ea66626e0cde29a7c24f370b85548ae6b5d4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 09:27:15 +00:00
Bob Badour
ec84245e25 Fix breakage: bad path join using '/' literal am: 2a5c090c31 am: cf96d25b3d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2052015

Change-Id: Ied9a569c0941fe2525cbfb448137a6c92940ddf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 09:07:56 +00:00
Bob Badour
cf96d25b3d Fix breakage: bad path join using '/' literal am: 2a5c090c31 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2052015

Change-Id: I6ed0ca734baf7d5f05a15b618f57f2a6ec97c427
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 08:54:20 +00:00
Bob Badour
2a5c090c31 Fix breakage: bad path join using '/' literal 
Typo in filename s/b NOTICE.html.gz not NOTICES.html.gz

Bug: 227682036

Test: TARGET_BUILD_VARIANT=userdebug UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true vendor/google/build/mainline_modules_bundles.sh -j97

Change-Id: I75cc28e3ef22d975ad46f4e167071f6d82ba253d
 2022-03-31 23:40:28 -07:00
Bob Badour
8d17118d5a Build notice files from license metadata. am: 43c2dcaef6 am: 6f7de5b1a9 am: cbcf8d9b05 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2047886

Change-Id: I6a76eee6321538b70c331a2e2a9cb1e5b644ac04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-31 23:13:51 +00:00
Bob Badour
cbcf8d9b05 Build notice files from license metadata. am: 43c2dcaef6 am: 6f7de5b1a9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2047886

Change-Id: I09993978f902d3e4b569cd676de0a56d5638ff2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-31 22:59:24 +00:00
Bob Badour
6f7de5b1a9 Build notice files from license metadata. am: 43c2dcaef6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2047886

Change-Id: Ifb7f10f9efc036f13a1c7f7ea4279ac53d0a4a1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-31 22:43:10 +00:00
TreeHugger Robot
86aa11c043 Merge "Clear apex.go entries for bluetooth libs" into tm-dev 2022-03-31 21:37:02 +00:00
Sam Delmerico
489831660c convert java_import jars with arch variants 
Bug: 220168131
Test: go test ./bp2build -run TestJavaImport
Test: b build '...'
Change-Id: Ib485e6905e7be9d199af5295b23131c226fd6e96
 2022-03-31 21:00:24 +00:00
Bob Badour
43c2dcaef6 Build notice files from license metadata. 
Switch from generate-notice-files.py and mergenotice.py to htmlnotice.

Bug: 151177513
Bug: 213388645
Bug: 210912771

Test: m droid dist reportmissinglicenses
Change-Id: I6cac049d24f35ec358c6f341a04f4ba6161703bf
 2022-03-31 17:29:01 +00:00
Spandan Das
d3fae5f2ed Remove android.safetycenter from framework-permission bcp permitted_packges 
The permitted_packages check is now per jar and not per apex. Remove
safetycenter from the map since this package prefix cannot be in
framework-permission

Bug: 205719989
Bug: 205289292
Test: TH
Change-Id: I473731a697fb09319037536dead97f5abf4bd6ea
 2022-03-31 15:48:24 +00:00
Spandan Das
440ff96728 Change permitted_packages check to be per-jar rather than per-apex 
(This CL has been implemented in master to prevent a merge conflict with
ag/16222633. It will be cherry-picked to AOSP)

Summary:
- updates the Q and R maps, the new keys are the bcp jars and not the
apexes. neverallow build rules ensure that these bcp jars have a
restricted set of permitted_packages
- remove BootclasspathJar from the neverallow rule. This is no longer
necessary since the keys in the maps are the bootjars themselves, and
not apexes

Bug: 205289292
Test: In build/soong, go test ./apex
Change-Id: Icb91de934181a8b6f085e03a0ce8c5e08504ff94
 2022-03-31 15:47:45 +00:00
Anton Hansson
ddf8c1bed9 Revert "Relax apex package restriction for T+ jars" 
This reverts commit 1fdd6ca88a.

Reason for revert: b/205289292 tracks the real fix for this

Test: presubmit
Change-Id: I5a2edaf4f930dafa26659f85d9425e9041c72275
(cherry picked from commit 1d016c50d0ee18ebc81ce7966e616b9936befd5a)
 2022-03-31 15:47:12 +00:00
Treehugger Robot
9d404443c6 Merge "Allow Rust for tombstoned client." am: 76ff96f885 am: 2774891cd6 am: 7662640b42 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2042045

Change-Id: I4ac7e638a1763d4fabba8a7bd6e44ec516c371f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-31 14:06:22 +00:00
Treehugger Robot
7662640b42 Merge "Allow Rust for tombstoned client." am: 76ff96f885 am: 2774891cd6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2042045

Change-Id: Ida22f0ccbfc886f741a4c3308027922c47ae0529
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-31 13:47:44 +00:00
Treehugger Robot
2774891cd6 Merge "Allow Rust for tombstoned client." am: 76ff96f885 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2042045

Change-Id: Ic925bdde55c4b49e5055117786add77f198258a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-31 13:24:34 +00:00
Treehugger Robot
76ff96f885 Merge "Allow Rust for tombstoned client." 2022-03-31 13:01:10 +00:00
Sam Delmerico
dc459dc9c1 Merge changes I8e4c3f37,I89a32bde am: 3c25ab1ac3 am: a2db166241 am: fd13aac77a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2032106

Change-Id: I320fc8b4385337497d684399e6f6b0c54084f8ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-30 22:07:11 +00:00
Treehugger Robot
5d123b15d9 Merge changes from topic "no-srcs-no-deps" am: d93afba1e6 am: d218781011 am: beb28cd9ad 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1995730

Change-Id: I8c8c7b973ffc6a6dfd91c35dc96e73c42bf30577
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-30 22:07:01 +00:00
Sam Delmerico
fd13aac77a Merge changes I8e4c3f37,I89a32bde am: 3c25ab1ac3 am: a2db166241 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2032106

Change-Id: Ibe7c1a290934a9992009946d51dc0b6cc31df235
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-30 21:45:45 +00:00
Treehugger Robot
beb28cd9ad Merge changes from topic "no-srcs-no-deps" am: d93afba1e6 am: d218781011 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1995730

Change-Id: I61f076d3e872e90b9375cd6fee2639863dd016cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-30 21:45:36 +00:00
Sam Delmerico
a2db166241 Merge changes I8e4c3f37,I89a32bde am: 3c25ab1ac3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2032106

Change-Id: Ic058bec1f52af235e047c1d96aaf8624f1e6e454
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-30 21:29:23 +00:00
Treehugger Robot
d218781011 Merge changes from topic "no-srcs-no-deps" am: d93afba1e6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1995730

Change-Id: Ibde8e40e3b7f704aee45c32b0c922c3178cbadf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-30 21:28:59 +00:00
Sam Delmerico
3c25ab1ac3 Merge changes I8e4c3f37,I89a32bde 
* changes:
  add plugins to javaLibraryAttributes
  convert java_import_host with bp2build; enable jetifier
 2022-03-30 21:08:12 +00:00
Treehugger Robot
d93afba1e6 Merge changes from topic "no-srcs-no-deps" 
* changes:
  enable conversion of all java_import modules
  emulate java_library static_deps with Bazel exports
 2022-03-30 21:06:46 +00:00