Commit Graph

42068 Commits

Author SHA1 Message Date
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 f8f3b93130 Merge "Rename fields in dexpreopt config" am: 564fce4578
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1699427

Change-Id: I4b7b7660109810ffccca2711cfe492a5787194c3
2021-05-08 02:04:33 +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 4c58850bbf Merge "Declare ConfiguredJarList in specific fragment implementations." am: ee7e359131
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1699192

Change-Id: I4d406077cdcbc092b9672bf3bf1c05c464c9e1eb
2021-05-07 19:58:58 +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
Elliott Hughes 98004216d9 Merge "Remove most of the remaining references to gccCmd." am: aa4c712989 am: a09ee94843 am: 2aa090f638
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1696319

Change-Id: Ia79aab6e3900694a02e896ddf543e4b194f46027
2021-05-07 19:13:45 +00:00
Elliott Hughes 7d52df4f87 Merge "Remove unused parts of the strip implementation." am: 2e0436c7af am: e21f8f645c am: 9fb4c1bbac
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1697656

Change-Id: I893a9e2c01e7f96e5f3712b0611aa69760e58af0
2021-05-07 19:13:35 +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
Elliott Hughes 2aa090f638 Merge "Remove most of the remaining references to gccCmd." am: aa4c712989 am: a09ee94843
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1696319

Change-Id: I3d6520fb4d290158d729225fbed945f28625b142
2021-05-07 18:48:29 +00:00
Elliott Hughes 9fb4c1bbac Merge "Remove unused parts of the strip implementation." am: 2e0436c7af am: e21f8f645c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1697656

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

Change-Id: I1241af54ca19334578bb43005700bde5fae32afa
2021-05-07 18:41:01 +00:00
Elliott Hughes a09ee94843 Merge "Remove most of the remaining references to gccCmd." am: aa4c712989
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1696319

Change-Id: Ia39631f189b56118df77fd22794cb3add7fc25a5
2021-05-07 18:35:21 +00:00
Treehugger Robot 3b755d4560 Merge "Split SYSTEMSERVERCLASSPATH entries from platform_bootclasspath." 2021-05-07 18:34:52 +00:00
Elliott Hughes e21f8f645c Merge "Remove unused parts of the strip implementation." am: 2e0436c7af
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1697656

Change-Id: I4fa057fce73f68a436dad57d7d6ff0387297c1ff
2021-05-07 18:33:04 +00:00
Elliott Hughes aa4c712989 Merge "Remove most of the remaining references to gccCmd." 2021-05-07 18:15:42 +00:00
Elliott Hughes 2e0436c7af Merge "Remove unused parts of the strip implementation." 2021-05-07 18:15:17 +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 655970204c Merge "Install updatable-bcp-packages.txt and boot-image.bprof" am: 225e4dbae4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1699203

Change-Id: I1153a08b44946b9d4b8100e79f55faa77f232386
2021-05-07 14:34:55 +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 78ff835a32 Merge "Stop exporting java_sdk_library libs in the snapshot" am: 320055eb8c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1697676

Change-Id: If21ded2582835f36062511d43d03aa2c10827cf4
2021-05-07 13:48:55 +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 5b4530d137 Merge "Make licenseModule SdkAware" am: e746f30a0b am: 11abc8f8d6 am: 65d891eb67
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1699187

Change-Id: Id4d1d06b6b4d07a05e4b90f00ee2fc4a50f2f2b5
2021-05-07 13:03:29 +00:00
Paul Duffin 44ee86df45 Merge "Make sdk tests more realistic" am: e0fc8725f3 am: bef3a5ce3e am: 7b8d04b3b8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1699186

Change-Id: I51c669acca0a0870e784f2831aad095c70a99468
2021-05-07 13:03:23 +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 65d891eb67 Merge "Make licenseModule SdkAware" am: e746f30a0b am: 11abc8f8d6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1699187

Change-Id: I15ee1ef26db007e5b65152baf05e84b5bbbffbb4
2021-05-07 12:44:05 +00:00
Paul Duffin 7b8d04b3b8 Merge "Make sdk tests more realistic" am: e0fc8725f3 am: bef3a5ce3e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1699186

Change-Id: I899ecb12c2d87598befccdb2a98b8047ffec7fe3
2021-05-07 12:44:01 +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
Paul Duffin e1fab6a30b Merge "Make all SdkMemberTypes support transitive member deps" am: dbb490359a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1699188

Change-Id: Id7f35c99e3cf7ffdb9627afb73b802fac734e154
2021-05-07 12:36:35 +00:00
Paul Duffin 11abc8f8d6 Merge "Make licenseModule SdkAware" am: e746f30a0b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1699187

Change-Id: I700e883007f12cf70a118b9708314c1297c18144
2021-05-07 12:36:28 +00:00
Paul Duffin dbb490359a Merge "Make all SdkMemberTypes support transitive member deps" 2021-05-07 12:31:15 +00:00
Paul Duffin e746f30a0b Merge "Make licenseModule SdkAware" 2021-05-07 12:31:03 +00:00
Paul Duffin bef3a5ce3e Merge "Make sdk tests more realistic" am: e0fc8725f3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1699186

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

Change-Id: Ic6c043bb9f549fc2326f44b50ee5ff2f38c199c1
2021-05-07 12:27:37 +00:00
satayev 95e9c5bbfa Split SYSTEMSERVERCLASSPATH entries from platform_bootclasspath.
Boot jars are different to system server jars at build level, due to
added complexity of dexpreopt. As a logical separation add a new
classpath fragment type and split existing classpaths.proto generation
into relevant pieces.

Bug: 180105615
Test: m && launch_cvd; atest CtsClasspathsTestCases
Change-Id: I88bec09fc920166ffd0092faef980754ddeb6593
2021-05-07 13:24:16 +01:00
Paul Duffin e0fc8725f3 Merge "Make sdk tests more realistic" 2021-05-07 12:16:25 +00:00
Paul Duffin 820ed78954 Merge "Add missing calls to InitSdkAwareModule" 2021-05-07 12:15:16 +00:00
Paul Duffin be007d1800 Install updatable-bcp-packages.txt and boot-image.bprof
Previous refactorings of the code for creating these two files caused
them to be created before the boot.prof file instead of afterwards. As
a result even though they were appended to the list of files to install
they were discarded when the boot.prof file set the list rather than
appended to it. That worked before the refactoring because the
boot.prof file set the list first before the others were appended to
it.

This change appends the boot.prof file to the list making the order in
which they are added irrelevant.

Bug: 187494247
Test: m nothing
      - check DEXPREOPT_IMAGE_PROFILE_BUILT_INSTALLED in generated
        make_vars file to ensure it includes all 3 files.
Change-Id: Idb94531daf61b1b047c72eb5c67a57d3fdced05c
2021-05-07 13:07:34 +01:00
Paul Duffin f93ca54858 Merge "Transitively add APEX variants for contents of prebuilt_apex/apex_set" am: c76155cd71 am: c8e88cf3f7 am: 85e40bba2c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1697056

Change-Id: Ieed47b213f67248c1bc13957036c1037c356789b
2021-05-07 09:15:50 +00:00
Paul Duffin 85e40bba2c Merge "Transitively add APEX variants for contents of prebuilt_apex/apex_set" am: c76155cd71 am: c8e88cf3f7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1697056

Change-Id: I25aaada86866e4a869972a106d07a8e7c9208f68
2021-05-07 09:00:35 +00:00