StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
42,275 Commits 1 Branch 0 Tags
f3042faefe3afd49142fdb138e943b123049f877
Commit Graph

4770 Commits

Author SHA1 Message Date
Paul Duffin
f3042faefe Add java_sdk_library in bootclasspath_fragment contents to sdk am: a10bd3c127 am: 94a452c768 am: 58fcebb1a7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1705470

Change-Id: I673fd870c37f11966c4914c033ab8f96b8ece825
 2021-05-13 23:23:42 +00:00
Paul Duffin
58fcebb1a7 Add java_sdk_library in bootclasspath_fragment contents to sdk am: a10bd3c127 am: 94a452c768 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1705470

Change-Id: I611119b71b2087c37250968024278ce938cfe04a
 2021-05-13 23:05:14 +00:00
Paul Duffin
a10bd3c127 Add java_sdk_library in bootclasspath_fragment contents to sdk 
A java_library specified in a bootclasspath_fragment's contents
property will be automatically added to the sdk containing that
bootclasspath_fragment. Previously, if that was attempted with a
java_sdk_library it would be added to the sdk as if it was a normal
java_boot_libs which would prevent the sdk from containing the
API specific artifact such as current.txt files and stub libraries
and sources.

This change fixes that and adds a java_sdk_library as a java_sdk_libs
module.

Bug: 177892522
Test: m nothing
Change-Id: Ided57b846ce5b8940c7e898c786fd77602582ea2
 2021-05-13 21:25:42 +01:00
Paul Duffin
39ca8223ae Merge "Build boot images in bootclasspath_fragment/platform_bootclasspath" am: 4bbf45faef am: 748d954062 am: 57610650d1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1690884

Change-Id: I314c01f74f2fe58576d66c1979a1d1ca14f5cad6
 2021-05-13 17:09:17 +00:00
Treehugger Robot
648d0fab59 Merge "Add support for SOONG_SDK_SNAPSHOT_USE_SRCJAR" am: 820397deb2 am: 66f9ac0d33 am: c0de64161c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1706107

Change-Id: I69d8f0ed2459d8722c620d3a9984363318fd5ec2
 2021-05-13 17:09:10 +00:00
Paul Duffin
57610650d1 Merge "Build boot images in bootclasspath_fragment/platform_bootclasspath" am: 4bbf45faef am: 748d954062 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1690884

Change-Id: Ifa764af1894637846631c9aba05128f7f307df0d
 2021-05-13 16:52:54 +00:00
Treehugger Robot
c0de64161c Merge "Add support for SOONG_SDK_SNAPSHOT_USE_SRCJAR" am: 820397deb2 am: 66f9ac0d33 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1706107

Change-Id: Id4649acc8899ce6a25fbcdc16fc6c688fa9f4f73
 2021-05-13 16:52:37 +00:00
Paul Duffin
4bbf45faef Merge "Build boot images in bootclasspath_fragment/platform_bootclasspath" 2021-05-13 16:32:23 +00:00
Treehugger Robot
820397deb2 Merge "Add support for SOONG_SDK_SNAPSHOT_USE_SRCJAR" 2021-05-13 16:00:40 +00:00
Paul Duffin
da21f0e88c Merge "Separate storing config for MakeVars from building boot image" am: f356e5a533 am: eb18e84459 am: 443d6ab74b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1690882

Change-Id: I3c09cc7cc1c1b56db2e9e806134472863f6a8f19
 2021-05-13 14:53:59 +00:00
Paul Duffin
443d6ab74b Merge "Separate storing config for MakeVars from building boot image" am: f356e5a533 am: eb18e84459 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1690882

Change-Id: I13f7019e51915305453cc9c5da4cb6c7cc393a71
 2021-05-13 14:36:55 +00:00
Paul Duffin
f356e5a533 Merge "Separate storing config for MakeVars from building boot image" 2021-05-13 14:01:36 +00:00
Paul Duffin
8a08117373 Merge "Move copying of dex files from dexpreopt_bootjars singleton" am: cfd24da1f4 am: 7be9378c61 am: 817187082c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1690881

Change-Id: If03ec0c3263413d2c88d91d510752d6bb3d4de80
 2021-05-13 11:52:25 +00:00
Paul Duffin
817187082c Merge "Move copying of dex files from dexpreopt_bootjars singleton" am: cfd24da1f4 am: 7be9378c61 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1690881

Change-Id: I75aa39288ab8f7350d7844c7e4dd262c635746d6
 2021-05-13 11:35:04 +00:00
Paul Duffin
cfd24da1f4 Merge "Move copying of dex files from dexpreopt_bootjars singleton" 2021-05-13 10:53:51 +00:00
Paul Duffin
22628d50f3 Add support for SOONG_SDK_SNAPSHOT_USE_SRCJAR 
Test: m SOONG_SDK_SNAPSHOT_USE_SRCJAR=true ipsec-module-sdk
      - check generated snapshot.zip file.
Change-Id: I02991e2a60d7784984b308cff2c47ee809d61f01
 2021-05-12 23:13:22 +01:00
Ivan Lozano
a072c5ae56 Merge "Refactor vendor snapshot to use LinkableInterface." am: 7ce2dee09e am: 61c475060a am: 001c11e93a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1680606

Change-Id: Ifff15886dba6bda0754d086456a1db3b7524e4ed
 2021-05-12 21:13:41 +00:00
Ivan Lozano
001c11e93a Merge "Refactor vendor snapshot to use LinkableInterface." am: 7ce2dee09e am: 61c475060a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1680606

Change-Id: I2826cb9898e093f5669700c8d98e314b445ee639
 2021-05-12 20:55:58 +00:00
Paul Duffin
2fc82ad044 Build boot images in bootclasspath_fragment/platform_bootclasspath 
Moves the building of boot images from the dexpreopt_bootjars singleton
to the bootclasspath_fragment and platform_bootclasspath.

The art boot image is generated by the art-bootclasspath-fragment
module and the framework boot image by the platform-bootclasspath
module.

This does temporarly duplicate the generation of an identical boot
profile for each image. As part of the work to modularize the boot
image profile each image will have its own custom default boot profile.

Bug: 177892522
Bug: 186455808
Test: m droid and TreeHugger
Change-Id: I23cf05ec7648749b21c7cf6fcba282b46649a981
 2021-05-12 21:51:27 +01:00
Paul Duffin
47932935e9 Separate storing config for MakeVars from building boot image 
Previously, the initialization of the dexpreoptBootJars fields used to
store information needed in its MakeVars method was interleaved with
the calls to buildBootImage(). In fact those fields were initialized
from the *bootImageConfig returned by buildBootImage(). However, the
method simply returned the *bootImageConfig value that was passed in.

Separating the initialization from the calls to buildBootImage() allows
the functionality to be moved to platform_bootclasspath separately.

Bug: 177892522
Test: m nothing
Change-Id: I8ba460f60be553516de5f186e14377bb0ec1b2cd
 2021-05-12 21:51:27 +01:00
Paul Duffin
7ebebfd5f8 Move copying of dex files from dexpreopt_bootjars singleton 
The art dex files are copied in the bootclasspath_fragment and the
non-updatable and updatable dex files are copied in the
platform_bootclasspath.

Bug: 177892522
Test: m nothing
Change-Id: I5d3d533d1a7a9f8e7ae20c12eb33029a898a2cd6
 2021-05-12 21:51:19 +01:00
Ivan Lozano
d7586b6526 Refactor vendor snapshot to use LinkableInterface. 
Refactors the vendor snapshot support to use the LinkableInterface
so that support can be extended to Rust. This CL does not add
vendor snapshot support for Rust; that is left for a follow-on CL.

Bug: 184042776
Test: m nothing
Change-Id: Id0c4970ca00053484a52677d182153cbc454c301
 2021-05-12 14:01:10 -04:00
Jaewoong Jung
310e197d6d Merge "Strict updatability linting against dependencies." am: ccbbeb6965 am: 9319584fad am: bcaf0e855b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1702008

Change-Id: Ie02a46af6665bd6158a4bc1acd72be5d129d0854
 2021-05-11 16:34:54 +00:00
Jaewoong Jung
bcaf0e855b Merge "Strict updatability linting against dependencies." am: ccbbeb6965 am: 9319584fad 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1702008

Change-Id: I9f334ee36a091a02b8df1a7493299675c656ed5a
 2021-05-11 16:10:22 +00:00
Jaewoong Jung
ccbbeb6965 Merge "Strict updatability linting against dependencies." 2021-05-11 15:24:06 +00:00
Treehugger Robot
ddcf758f8c Merge "Generate empty classpaths.proto for bootclasspath_fragment.go." am: a556647c50 am: 3e51be492f am: 613e4c502a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1699193

Change-Id: Ia92df6204946e3e28341cd27a75d108b657754cc
 2021-05-11 13:44:08 +00:00
Treehugger Robot
613e4c502a Merge "Generate empty classpaths.proto for bootclasspath_fragment.go." am: a556647c50 am: 3e51be492f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1699193

Change-Id: Ia3e193863fffc4222edd3ddc908a5f489f1e7a61
 2021-05-11 13:27:02 +00:00
satayev
3db3547d1f Generate empty classpaths.proto for bootclasspath_fragment.go. 
- Adds all required details for bootclasspath_fragment to implement
  classpath_fragment.
- Keeps the actual boot jars in platform-bootclasspath to begin with.
- Makes sure to put the file in apex/etc/classpath on device. Note that
  for platform versions of classpath fragment AndroidMkEntries perform
  the installation, while for APEXes it must be plumbed via apex.go.

Bug: 180105615
Test: m && launch_cvd; atest CtsClasspathsTestCases
Change-Id: I6101ebdf5b8bcbe95c0b7ce21f3f67a2685aef50
 2021-05-11 10:34:47 +01:00
Jaewoong Jung
476b9d6d17 Strict updatability linting against dependencies. 
Propagate strict_updatability_linting to transitive dependencies using a
top-down mutator.

Test: lint_test.go
Bug: 182349282
Change-Id: Ifc9e58f1a597e3c7725ee49b4027afb6f42f45cb
 2021-05-10 15:30:00 -07:00
Treehugger Robot
8c112087cb Merge "Rename fields in dexpreopt config" am: 564fce4578 am: f8f3b93130 am: 517f7ba95b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1699427

Change-Id: Iadeefe9966ca6b3ce5815befc6f6616c87a7c26b
 2021-05-08 02:45:56 +00:00
Treehugger Robot
517f7ba95b Merge "Rename fields in dexpreopt config" am: 564fce4578 am: f8f3b93130 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1699427

Change-Id: I6614ad3de51e09cd74ef0b75e31bfca3ac116cb5
 2021-05-08 02:27:10 +00:00
Treehugger Robot
564fce4578 Merge "Rename fields in dexpreopt config" 2021-05-08 01:47:39 +00:00
satayev
4cb335b3e5 Merge "Declare ConfiguredJarList in specific fragment implementations." am: ee7e359131 am: 4c58850bbf am: 01ac28b3bb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1699192

Change-Id: Id0913f243c279cd8d64982d3b8fe16c66b3b3fae
 2021-05-07 20:51:15 +00:00
satayev
01ac28b3bb Merge "Declare ConfiguredJarList in specific fragment implementations." am: ee7e359131 am: 4c58850bbf 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1699192

Change-Id: Ief67bfa6e112726d610acc30547b3526d563bce0
 2021-05-07 20:29:12 +00:00
satayev
ee7e359131 Merge "Declare ConfiguredJarList in specific fragment implementations." 2021-05-07 19:41:08 +00:00
Treehugger Robot
4fe97969e7 Merge "Split SYSTEMSERVERCLASSPATH entries from platform_bootclasspath." am: 3b755d4560 am: afa1bff5aa am: 1ba4987c0e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1689755

Change-Id: Id30b2f1354e36af0183b814c4f93fbc620345738
 2021-05-07 19:13:59 +00:00
Treehugger Robot
1ba4987c0e Merge "Split SYSTEMSERVERCLASSPATH entries from platform_bootclasspath." am: 3b755d4560 am: afa1bff5aa 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1689755

Change-Id: I6346fe8c962441bebd49bb007f888e3577a94cbe
 2021-05-07 18:49:22 +00:00
Treehugger Robot
3b755d4560 Merge "Split SYSTEMSERVERCLASSPATH entries from platform_bootclasspath." 2021-05-07 18:34:52 +00:00
satayev
013485bd83 Declare ConfiguredJarList in specific fragment implementations. 
Each specific classpath_fragment module knows what jars must be part
of the corresponding classpaths.proto config.

Note that bootclasspath_fragment does not implement classpath_fragment
yet, thus all boot jars and all system server jars go into corresponding
platform classpaths.

Bug: 180105615
Test: m && launch_cvd; atest CtsClasspathsTestCases
Change-Id: I6a8c7b0a5d17d62e790a441b8e2c5c1a816e7f30
 2021-05-07 16:31:07 +01:00
Paul Duffin
5e1308f1a4 Merge "Install updatable-bcp-packages.txt and boot-image.bprof" am: 225e4dbae4 am: 655970204c am: 690697082b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1699203

Change-Id: I9d9dd64c8ba4c2512403a647c322964f225d35d9
 2021-05-07 15:24:38 +00:00
Paul Duffin
690697082b Merge "Install updatable-bcp-packages.txt and boot-image.bprof" am: 225e4dbae4 am: 655970204c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1699203

Change-Id: I4954e75a300a11f86a20e7113afaeec107295faf
 2021-05-07 15:04:51 +00:00
Paul Duffin
fc84067bd3 Merge "Stop exporting java_sdk_library libs in the snapshot" am: 320055eb8c am: 78ff835a32 am: 2e4abd4a58 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1697676

Change-Id: If10f3212b75bd6aca4126c633fce3f66fd3da40f
 2021-05-07 14:21:56 +00:00
Paul Duffin
225e4dbae4 Merge "Install updatable-bcp-packages.txt and boot-image.bprof" 2021-05-07 14:14:20 +00:00
Paul Duffin
2e4abd4a58 Merge "Stop exporting java_sdk_library libs in the snapshot" am: 320055eb8c am: 78ff835a32 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1697676

Change-Id: I309abc61fb11075093214df29eda9ef1d44cd595
 2021-05-07 14:05:10 +00:00
Paul Duffin
320055eb8c Merge "Stop exporting java_sdk_library libs in the snapshot" 2021-05-07 13:34:33 +00:00
Paul Duffin
c05cbcebb5 Merge "Make all SdkMemberTypes support transitive member deps" am: dbb490359a am: e1fab6a30b am: 8d108bac17 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1699188

Change-Id: I65568bd7614795269017f59c0e3e3f28ef9b91eb
 2021-05-07 13:03:34 +00:00
Paul Duffin
668b463729 Merge "Add missing calls to InitSdkAwareModule" am: 820ed78954 am: c74ff5cae5 am: 33334e65b7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1699185

Change-Id: I905acd55de919d38a0248d32b5daabf8452e9d23
 2021-05-07 13:03:15 +00:00
Paul Duffin
8d108bac17 Merge "Make all SdkMemberTypes support transitive member deps" am: dbb490359a am: e1fab6a30b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1699188

Change-Id: Ia82883e6085db6f19ed5c5307b78e72959cd4da2
 2021-05-07 12:44:10 +00:00
Paul Duffin
33334e65b7 Merge "Add missing calls to InitSdkAwareModule" am: 820ed78954 am: c74ff5cae5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1699185

Change-Id: I4bf1ee3640bab68d7c38079e71eec25f212a84c3
 2021-05-07 12:43:54 +00:00
Jeongik Cha
a596909342 Rename fields in dexpreopt config 
Add 'host' into the name of fields regarding path on the host side to
distinguish between paths on the device(which will be added in the
following commit), and paths on the host.

Bug: 158843648
Test: build and flash, and then
  adb wait-for-device \
    && adb -s $S root \
    && adb -s $S logcat \
    | grep -E 'ClassLoaderContext [a-z ]+ mismatch' -C 1
Change-Id: Ib2645ed51591ba2f4b726c115b401ad2bd6675da
 2021-05-07 21:40:23 +09:00