Commit graph

8693 commits

Author SHA1 Message Date
Kangping Dong
53f294f801 Merge "add service-threadnetwork to system_server jars" into main am: 693afdca74 am: a3ecbf45ff am: 2927114277 am: c9761ba941 am: 7ed4bac356
Original change: https://android-review.googlesource.com/c/platform/build/+/2651500

Change-Id: I514d6d317d08468a114acc1ce48efeff89891eae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 13:39:46 +00:00
Kangping Dong
7ed4bac356 Merge "add service-threadnetwork to system_server jars" into main am: 693afdca74 am: a3ecbf45ff am: 2927114277 am: c9761ba941
Original change: https://android-review.googlesource.com/c/platform/build/+/2651500

Change-Id: I675cb9b3255afca7475e3649ce67d31a735176f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 12:57:28 +00:00
Kangping Dong
2927114277 Merge "add service-threadnetwork to system_server jars" into main am: 693afdca74 am: a3ecbf45ff
Original change: https://android-review.googlesource.com/c/platform/build/+/2651500

Change-Id: If9847ed876df7f4ef1a001aba354390ea12854b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 11:03:21 +00:00
Kangping Dong
693afdca74 Merge "add service-threadnetwork to system_server jars" into main 2023-07-19 09:40:46 +00:00
Timothy Yiu
b40f43f1c4 Merge "Conditionally remove DSU for wearable targets" into main am: e97b271350 am: 5cd4465e5b am: de6b4abf85 am: dc72516b93 am: b71494330f
Original change: https://android-review.googlesource.com/c/platform/build/+/2657595

Change-Id: I0088245a742e2a3066626ac691ca4ddcba7fa2c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 08:04:16 +00:00
Timothy Yiu
b71494330f Merge "Conditionally remove DSU for wearable targets" into main am: e97b271350 am: 5cd4465e5b am: de6b4abf85 am: dc72516b93
Original change: https://android-review.googlesource.com/c/platform/build/+/2657595

Change-Id: Ifaa2b4eda8dac6f7ea7c351ac85a69667808896b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 07:21:49 +00:00
Timothy Yiu
de6b4abf85 Merge "Conditionally remove DSU for wearable targets" into main am: e97b271350 am: 5cd4465e5b
Original change: https://android-review.googlesource.com/c/platform/build/+/2657595

Change-Id: Ie58334b351dbf57cf6d5a86dd574aa818cd63841
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 06:12:25 +00:00
Timothy Yiu
e97b271350 Merge "Conditionally remove DSU for wearable targets" into main 2023-07-19 04:04:21 +00:00
tyiu
741227c432 Conditionally remove DSU for wearable targets
Bug: 289629075
Test: m + Treehugger
Change-Id: Idcf862ee728d81b37ee6a37eb4001969102e250f
2023-07-18 23:59:13 +00:00
Treehugger Robot
9b6489bc71 Merge "GSI: add VNDK 34/remove VNDK 29" into main 2023-07-18 10:41:06 +00:00
Sebastian Pickl
e9f1614b96 Merge "Revert "Minify the sdk targets"" into main am: 21c04ea58c am: cda6860015 am: 2adedc48db am: d308445b2b am: 7ca250e24f
Original change: https://android-review.googlesource.com/c/platform/build/+/2658380

Change-Id: I446198af84ed39e0a0ddc4bad48eefeb549e6453
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 13:46:49 +00:00
Sebastian Pickl
7ca250e24f Merge "Revert "Minify the sdk targets"" into main am: 21c04ea58c am: cda6860015 am: 2adedc48db am: d308445b2b
Original change: https://android-review.googlesource.com/c/platform/build/+/2658380

Change-Id: I527f63bf6f7325c22e4b4b5c2f655ddfb6dafa78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 13:02:28 +00:00
Sebastian Pickl
2adedc48db Merge "Revert "Minify the sdk targets"" into main am: 21c04ea58c am: cda6860015
Original change: https://android-review.googlesource.com/c/platform/build/+/2658380

Change-Id: Icadec50aaee8f81270422bb5d2452ef2ee9f283c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 11:36:16 +00:00
Sebastian Pickl
21c04ea58c Merge "Revert "Minify the sdk targets"" into main 2023-07-17 10:11:57 +00:00
Menghan Li
bda69f5991 Revert "Minify the sdk targets"
This reverts commit 7a114c5313.

Reason for revert: DroidMonitor-triggered revert due to breakage, bug b/291353860 verified with go/abtd https://android-build.googleplex.com/builds/abtd/run/L17500000961999253 by menghanli@

Change-Id: Iaaf37f780e71ef6f0eb745b3c06c1c5f47a8e03b
Bug: 291353860
2023-07-17 10:05:27 +00:00
Cole Faust
6d04cd8571 Merge "Minify the sdk targets" into main am: 7137d5d46f am: fbabd71b48 am: 18ae5a5b07 am: a171da26af am: c5dcae62c3
Original change: https://android-review.googlesource.com/c/platform/build/+/2656958

Change-Id: I3d786a692dee0306919d01f35c30aec3593c6f2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-15 01:18:56 +00:00
Cole Faust
c5dcae62c3 Merge "Minify the sdk targets" into main am: 7137d5d46f am: fbabd71b48 am: 18ae5a5b07 am: a171da26af
Original change: https://android-review.googlesource.com/c/platform/build/+/2656958

Change-Id: I6fda227d28bf1bca6462a6e48e68faf312551728
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-15 00:33:48 +00:00
Cole Faust
18ae5a5b07 Merge "Minify the sdk targets" into main am: 7137d5d46f am: fbabd71b48
Original change: https://android-review.googlesource.com/c/platform/build/+/2656958

Change-Id: I3d3ae6ea4b4bae5f76153e3143d16c1641f7354b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 22:39:19 +00:00
Cole Faust
7137d5d46f Merge "Minify the sdk targets" into main 2023-07-14 20:42:18 +00:00
Jiakai Zhang
ca23b252ef Merge changes from topics "art-boot-image-jars", "configured-jar-location-overrides" into main am: f2cc1324c1 am: 735385ff9f am: 9395ae7176 am: c74e13b349 am: 6fa83f1ebf
Original change: https://android-review.googlesource.com/c/platform/build/+/2655206

Change-Id: I1e2a11f3546dbb92e6313ba441f8f1ba91ec13f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 16:51:44 +00:00
Jiakai Zhang
6fa83f1ebf Merge changes from topics "art-boot-image-jars", "configured-jar-location-overrides" into main am: f2cc1324c1 am: 735385ff9f am: 9395ae7176 am: c74e13b349
Original change: https://android-review.googlesource.com/c/platform/build/+/2655206

Change-Id: Ifcc427f98b1fd93922ddee32480b3dd47d61cf07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 16:06:54 +00:00
Jiakai Zhang
9395ae7176 Merge changes from topics "art-boot-image-jars", "configured-jar-location-overrides" into main am: f2cc1324c1 am: 735385ff9f
Original change: https://android-review.googlesource.com/c/platform/build/+/2655206

Change-Id: Ic7e73ee2612434022836142abc4d7dc0663ce5cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 13:56:41 +00:00
Jiakai Zhang
f2cc1324c1 Merge changes from topics "art-boot-image-jars", "configured-jar-location-overrides" into main
* changes:
  Add a Make variable to determine ART boot image jars for testing.
  Add a Make variable that overrides configured jar locations.
2023-07-14 11:47:59 +00:00
Hung-ying Tyan
d4639705bd GSI: add VNDK 34/remove VNDK 29
Ignore-AOSP-First: Android U hasn't been published to AOSP yet

Bug: 291204040
Test: boot GSI on U Pixel

Change-Id: I04c50ca03a6ebd9b371a35f66faf5ea7861c6ca5
2023-07-14 09:06:39 +00:00
Neha Jain
3d4854452d Merge "Revert "Enable CFI for the whole Bluetooth repo and not just system"" into main am: 3505f2b3a4 am: dffb22be1e am: df039120bc am: e4098f4648 am: 4efaa94371 am: b64d7442e5
Original change: https://android-review.googlesource.com/c/platform/build/+/2655823

Change-Id: If6f611b679c9eb96a493e278fd42c76a6e4507c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 01:16:24 +00:00
Cole Faust
7a114c5313 Minify the sdk targets
Previously, the "sdk" target was a minimal lunch target that only
included enough to build the sdk. But the "sdk_<arch>" targets
redirected to the "sdk_phone_<arch>" targets, which are much bigger
and capable of building a whole emulator.

Building the sdk on products that can build a whole device complicates
the rest of the build system (for example, it starts enforcing dexpropt
works)

Bug: 290798660
Test: Presubmits
Change-Id: I0ec5110318c43a7feee0b88edbed1cab0b590a47
2023-07-13 16:40:30 -07:00
Jiakai Zhang
7bdb2b3c32 Add a Make variable to determine ART boot image jars for testing.
Bug: 290583827
Test: m nothing
Change-Id: Ibd0dd99593e4efb357e674c6a89804ea9cd47a84
2023-07-13 14:24:18 +01:00
Jiakai Zhang
17c6af46df Add a Make variable that overrides configured jar locations.
Bug: 290583827
Test: m nothing
Change-Id: I9a23d6a033d50d2a8c5d9e8dd79d00033efa1f53
2023-07-13 14:24:16 +01:00
Kangping Dong
a1a7046533 add service-threadnetwork to system_server jars
Instructions: go/mainline-java-lib#classpath-configuration

Bug: 262683651
Test: run `m -j16`
Change-Id: I3f2a8603669b16a7e3a7aeb06ac850add0df8c5d
2023-07-13 06:04:58 +00:00
Neha Jain
b64d7442e5 Merge "Revert "Enable CFI for the whole Bluetooth repo and not just system"" into main am: 3505f2b3a4 am: dffb22be1e am: df039120bc am: e4098f4648 am: 4efaa94371
Original change: https://android-review.googlesource.com/c/platform/build/+/2655823

Change-Id: Id85a3efe6649d80c477499b6f54a29058806ff68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-13 04:16:11 +00:00
Neha Jain
e4098f4648 Merge "Revert "Enable CFI for the whole Bluetooth repo and not just system"" into main am: 3505f2b3a4 am: dffb22be1e am: df039120bc
Original change: https://android-review.googlesource.com/c/platform/build/+/2655823

Change-Id: I8eb0e4c7cceb3d4d7b2b21ebfea57682ad42b0c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-13 02:47:36 +00:00
Neha Jain
3505f2b3a4 Merge "Revert "Enable CFI for the whole Bluetooth repo and not just system"" into main 2023-07-13 00:24:18 +00:00
Neha Jain
9926178660 Revert "Enable CFI for the whole Bluetooth repo and not just system"
This reverts commit d759b3517a.

Reason for revert: b/289779264

Change-Id: If7bdba6a420f2a310ad86b7b3b44eba5111c5d69
2023-07-12 23:16:25 +00:00
Roman Kiryanov
d1073b701e Merge "(reland2) Remove emulator dependencies on non emulator targets (2)" into main am: 76d1e380a6 am: f1fc68b180 am: 931b7ca52f am: 501fce7eef am: ba806fa9ad am: fa0f6547b8
Original change: https://android-review.googlesource.com/c/platform/build/+/2654583

Change-Id: I0de60df61d18590828e537215fde23dc04fb67dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 07:24:53 +00:00
Roman Kiryanov
fa0f6547b8 Merge "(reland2) Remove emulator dependencies on non emulator targets (2)" into main am: 76d1e380a6 am: f1fc68b180 am: 931b7ca52f am: 501fce7eef am: ba806fa9ad
Original change: https://android-review.googlesource.com/c/platform/build/+/2654583

Change-Id: I2bdef312f6c30642e9c412fa94c397937f6dd35d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 06:45:22 +00:00
Roman Kiryanov
501fce7eef Merge "(reland2) Remove emulator dependencies on non emulator targets (2)" into main am: 76d1e380a6 am: f1fc68b180 am: 931b7ca52f
Original change: https://android-review.googlesource.com/c/platform/build/+/2654583

Change-Id: If12221540df5c5e14d78ab296d383616a9908844
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 05:19:32 +00:00
Treehugger Robot
fac140d5a4 Merge "Remove the X attribute from .mk files" into main am: 6bd2bd8ae5 am: 712109c1f2 am: 9709297328 am: 5cc6f5d6f9 am: 3bfe27cc75 am: d0fab06602
Original change: https://android-review.googlesource.com/c/platform/build/+/2654582

Change-Id: I6cb6fa582e9a056149d70fd403a13ae451b82f62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 02:14:37 +00:00
Treehugger Robot
d0fab06602 Merge "Remove the X attribute from .mk files" into main am: 6bd2bd8ae5 am: 712109c1f2 am: 9709297328 am: 5cc6f5d6f9 am: 3bfe27cc75
Original change: https://android-review.googlesource.com/c/platform/build/+/2654582

Change-Id: I0c4259dde1349b10350b078031751b035d220341
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 01:34:13 +00:00
Treehugger Robot
5cc6f5d6f9 Merge "Remove the X attribute from .mk files" into main am: 6bd2bd8ae5 am: 712109c1f2 am: 9709297328
Original change: https://android-review.googlesource.com/c/platform/build/+/2654582

Change-Id: Ic7d95d07dd81326d54acd565e7a0374d54d8e42e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 00:08:23 +00:00
Roman Kiryanov
f945b5df68 (reland2) Remove emulator dependencies on non emulator targets (2)
the sidecar issue in GSI was fixed.

Bug: 111538404
Test: presubmit
Change-Id: Ia48ce2e076edc4f13f85e58d9bbbe15b8e6a4438
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-07-11 14:16:35 -07:00
Roman Kiryanov
3a3b121154 Remove the X attribute from .mk files
Bug: 111538404
Test: presubmit
Change-Id: Iefd39e76559ec25c4bdd98893dfc593816da5077
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-07-11 14:16:35 -07:00
Elliott Hughes
4d4aadf065 Merge "Switch from minigzip to gzip." into main am: c1577ff58b am: f94ff9146d am: d9cdcba928 am: 7a75419a51 am: 30376cd64f am: 0fb9e3f926
Original change: https://android-review.googlesource.com/c/platform/build/+/2632009

Change-Id: I5deb7ca79c55f59f22e4f65e3f2137aa0b35e84b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 20:43:34 +00:00
Elliott Hughes
0fb9e3f926 Merge "Switch from minigzip to gzip." into main am: c1577ff58b am: f94ff9146d am: d9cdcba928 am: 7a75419a51 am: 30376cd64f
Original change: https://android-review.googlesource.com/c/platform/build/+/2632009

Change-Id: I41c1e36baf0d01ee6d0d9a768ce2a06c361427a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 20:02:17 +00:00
Elliott Hughes
7a75419a51 Merge "Switch from minigzip to gzip." into main am: c1577ff58b am: f94ff9146d am: d9cdcba928
Original change: https://android-review.googlesource.com/c/platform/build/+/2632009

Change-Id: I9e0fe8aff864b5423a0a9c066838e76c1cea98a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 18:25:43 +00:00
Elliott Hughes
c1577ff58b Merge "Switch from minigzip to gzip." into main 2023-07-11 15:52:27 +00:00
Kangping Dong
d2543e4856 Merge "add com.android.threadnetwork to base_system.mk" am: 235662f15a am: a0e4fab6f0 am: d1ef7f4487 am: 7da60868fd am: 5a95717b65 am: c9b00f8d40
Original change: https://android-review.googlesource.com/c/platform/build/+/2645819

Change-Id: Ia1e3f9b32412253bf3fa87b104329c6631d759b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-04 05:55:29 +00:00
Kangping Dong
c9b00f8d40 Merge "add com.android.threadnetwork to base_system.mk" am: 235662f15a am: a0e4fab6f0 am: d1ef7f4487 am: 7da60868fd am: 5a95717b65
Original change: https://android-review.googlesource.com/c/platform/build/+/2645819

Change-Id: I752509f2232332a39030844dd1f4e6885a80c506
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-04 05:29:47 +00:00
Kangping Dong
7da60868fd Merge "add com.android.threadnetwork to base_system.mk" am: 235662f15a am: a0e4fab6f0 am: d1ef7f4487
Original change: https://android-review.googlesource.com/c/platform/build/+/2645819

Change-Id: Iaa48747f615b2d39e5e05b12d5a0ec28c6d3b129
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-04 04:10:06 +00:00
Kangping Dong
235662f15a Merge "add com.android.threadnetwork to base_system.mk" 2023-07-04 01:52:46 +00:00
Kangping Dong
286e55ad94 add com.android.threadnetwork to base_system.mk
Bug: 262683651
Test: atest CtsSystemApiSignatureTestCases
Merged-In: Iefe7fa4c74ab9608faeb9d64e75c054e9b90afdb
Change-Id: Id4f34b70aee2277236762092f8a40254963a6b4f
2023-07-03 17:24:05 +08:00