Commit Graph

43944 Commits

Author SHA1 Message Date
Victor Chang
2d457e1cc8 "module_current" and "system_server_current" should contain ART's @SystemApi(MODULE_LIBRARIES)
Before this fix, compiling a java_library against sdk_version:
"module_current" can't use the @SystemApi(MODULE_LIBRARIES) provided
by the ART module because the system module "core-current-stubs-system-modules"
contains only the public APIs.

Use the new system module with module lib APIs.

(cherry picked from commit b54f5aa359)

Bug: 183097033
Test: m droid
Merged-In: I274e2710d1ff34e896aa620bfafb4481180c53b5
Change-Id: I374bc4899ef8f60344e37a94ad3cb8492f47fb4d
2021-07-01 10:57:26 +01:00
Paul Duffin
a06f2e448f Merge "Support using java_sdk_library components in stub_libs" am: f03aaf5fc7 am: 0b11f6c748
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1752643

Change-Id: I645e7dbdc7913fce092d210cf5e521da594ef4ea
2021-07-01 09:57:19 +00:00
Orion Hodson
472603d46f Merge ""module_current" and "system_server_current" should contain ART's @SystemApi(MODULE_LIBRARIES)" am: 39924233e0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1748050

Change-Id: I2aec1a7220ba95db950c59332d709091e34044dc
2021-07-01 09:46:44 +00:00
Orion Hodson
39924233e0 Merge ""module_current" and "system_server_current" should contain ART's @SystemApi(MODULE_LIBRARIES)" 2021-07-01 09:43:41 +00:00
Paul Duffin
0b11f6c748 Merge "Support using java_sdk_library components in stub_libs" am: f03aaf5fc7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1752643

Change-Id: I4bc60c3680fc2fa94ba12731b7f5179f8d5e3212
2021-07-01 09:41:15 +00:00
Paul Duffin
f03aaf5fc7 Merge "Support using java_sdk_library components in stub_libs" 2021-07-01 09:22:49 +00:00
Weng Su
eb8a7b740a Revert "Add partial bp2build support for APEX targets." am: 7ce730b90c am: 9bc2ee5ca0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1753900

Change-Id: Iff2f0d358658098ccfd06bdca58a20b72db16de7
2021-07-01 08:00:41 +00:00
Weng Su
9bc2ee5ca0 Revert "Add partial bp2build support for APEX targets." am: 7ce730b90c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1753900

Change-Id: Ia3f1b07f76454725b1d0e4ea6202efd303cab36b
2021-07-01 07:43:06 +00:00
Rupert Shuttleworth
50be2a3716 Add partial bp2build support for APEX targets. am: 22b606b5f0 am: 356b7ca109
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1733232

Change-Id: Ia301f78ab5e9ad38d0eee2a525a4eb2895ae5722
2021-07-01 06:57:23 +00:00
Weng Su
7ce730b90c Revert "Add partial bp2build support for APEX targets."
Revert submission 1733232-roboleaf-apex

Reason for revert: b/192523357 Broken build 7512065 on aosp-master on sdk_x86_64-sdk
Reverted Changes:
Ie82c263f6:Add a stub rule for building APEX bundles.
I93e2a25fa:Add partial bp2build support for APEX targets.

Change-Id: I8e836fe7f466e02f3108680f9653412299e929e0
2021-07-01 06:51:11 +00:00
Inseob Kim
c5fe044474 Revert "Add install_in_root to cc_binary"
Revert "Add ramdisk_available to init_first_stage's deps"

Revert submission 15071196-init_first_stage_soong

Reason for revert: fixes b/192248690
Reverted Changes:
I23cf4f975:Add ramdisk_available to init_first_stage's deps
Icd98c7e24:Add ramdisk_available to init_first_stage's deps
If9da9ba16:Add ramdisk_available to init_first_stage's deps
Ibc8668029:Add ramdisk_available to init_first_stage's deps
I3b4b8c475:Add ramdisk_available to init_first_stage's deps
I59cd149e0:Completely migrate init first stage to Soong
I36d789578:Add ramdisk_available to init_first_stage's deps
I2a0daa612:Add BUILD_USES_RECOVERY_AS_BOOT to soong config
Ic76c325ce:Directly create ramdisk dirs in ramdisk image rule...
I4c5374deb:Add BOARD_BUILD_SYSTEM_ROOT_IMAGE to config vars
I8aab5faf3:Add ramdisk_available to init_first_stage's deps
I9d5a10661:Add ramdisk_available to init_first_stage's deps
Iaa2edeb4a:Add ramdisk_available to init_first_stage's deps
I7cb582ca0:Update init_first_stage
I06091d15e:Add ramdisk_available to init_first_stage's deps
I8bdb8dda3:Add ramdisk_available to init_first_stage's deps
I7436b8dd1:Add ramdisk_available to init_first_stage's deps
I39693fd86:Add ramdisk_available to init_first_stage's deps
I0a9ba90f0:Add ramdisk_available to init_first_stage's deps
Ib66b4c4ea:Add ramdisk_available to init_first_stage's deps
I31ce63d23:Add ramdisk_available to init_first_stage's deps
Icb580f97c:Add ramdisk_available to init_first_stage's deps
I044a075b7:Add ramdisk_available to init_first_stage's deps
I33164a7e7:Fix ndk and aml arch order
Ib8d92904a:Add ramdisk_available to sysprop_library
Ibc3516453:Add install_in_root to cc_binary

Change-Id: I3f48a1bee726c7c2b38c9bdc501b2a32337eaab7
2021-07-01 06:50:40 +00:00
Inseob Kim
2594e41a07 Revert "Add ramdisk_available to sysprop_library"
Revert "Add ramdisk_available to init_first_stage's deps"

Revert submission 15071196-init_first_stage_soong

Reason for revert: fixes b/192248690
Reverted Changes:
I23cf4f975:Add ramdisk_available to init_first_stage's deps
Icd98c7e24:Add ramdisk_available to init_first_stage's deps
If9da9ba16:Add ramdisk_available to init_first_stage's deps
Ibc8668029:Add ramdisk_available to init_first_stage's deps
I3b4b8c475:Add ramdisk_available to init_first_stage's deps
I59cd149e0:Completely migrate init first stage to Soong
I36d789578:Add ramdisk_available to init_first_stage's deps
I2a0daa612:Add BUILD_USES_RECOVERY_AS_BOOT to soong config
Ic76c325ce:Directly create ramdisk dirs in ramdisk image rule...
I4c5374deb:Add BOARD_BUILD_SYSTEM_ROOT_IMAGE to config vars
I8aab5faf3:Add ramdisk_available to init_first_stage's deps
I9d5a10661:Add ramdisk_available to init_first_stage's deps
Iaa2edeb4a:Add ramdisk_available to init_first_stage's deps
I7cb582ca0:Update init_first_stage
I06091d15e:Add ramdisk_available to init_first_stage's deps
I8bdb8dda3:Add ramdisk_available to init_first_stage's deps
I7436b8dd1:Add ramdisk_available to init_first_stage's deps
I39693fd86:Add ramdisk_available to init_first_stage's deps
I0a9ba90f0:Add ramdisk_available to init_first_stage's deps
Ib66b4c4ea:Add ramdisk_available to init_first_stage's deps
I31ce63d23:Add ramdisk_available to init_first_stage's deps
Icb580f97c:Add ramdisk_available to init_first_stage's deps
I044a075b7:Add ramdisk_available to init_first_stage's deps
I33164a7e7:Fix ndk and aml arch order
Ib8d92904a:Add ramdisk_available to sysprop_library
Ibc3516453:Add install_in_root to cc_binary

Change-Id: I9ac333972fcd016059ea73f48b295d7140414a50
2021-07-01 06:50:40 +00:00
Inseob Kim
f64377ca2f Revert "Fix ndk and aml arch order"
Revert "Add ramdisk_available to init_first_stage's deps"

Revert submission 15071196-init_first_stage_soong

Reason for revert: fixes b/192248690
Reverted Changes:
I23cf4f975:Add ramdisk_available to init_first_stage's deps
Icd98c7e24:Add ramdisk_available to init_first_stage's deps
If9da9ba16:Add ramdisk_available to init_first_stage's deps
Ibc8668029:Add ramdisk_available to init_first_stage's deps
I3b4b8c475:Add ramdisk_available to init_first_stage's deps
I59cd149e0:Completely migrate init first stage to Soong
I36d789578:Add ramdisk_available to init_first_stage's deps
I2a0daa612:Add BUILD_USES_RECOVERY_AS_BOOT to soong config
Ic76c325ce:Directly create ramdisk dirs in ramdisk image rule...
I4c5374deb:Add BOARD_BUILD_SYSTEM_ROOT_IMAGE to config vars
I8aab5faf3:Add ramdisk_available to init_first_stage's deps
I9d5a10661:Add ramdisk_available to init_first_stage's deps
Iaa2edeb4a:Add ramdisk_available to init_first_stage's deps
I7cb582ca0:Update init_first_stage
I06091d15e:Add ramdisk_available to init_first_stage's deps
I8bdb8dda3:Add ramdisk_available to init_first_stage's deps
I7436b8dd1:Add ramdisk_available to init_first_stage's deps
I39693fd86:Add ramdisk_available to init_first_stage's deps
I0a9ba90f0:Add ramdisk_available to init_first_stage's deps
Ib66b4c4ea:Add ramdisk_available to init_first_stage's deps
I31ce63d23:Add ramdisk_available to init_first_stage's deps
Icb580f97c:Add ramdisk_available to init_first_stage's deps
I044a075b7:Add ramdisk_available to init_first_stage's deps
I33164a7e7:Fix ndk and aml arch order
Ib8d92904a:Add ramdisk_available to sysprop_library
Ibc3516453:Add install_in_root to cc_binary

Change-Id: Iaccc4bada78e63fdae3249adfc668c0b30418758
2021-07-01 06:50:40 +00:00
Rupert Shuttleworth
356b7ca109 Add partial bp2build support for APEX targets. am: 22b606b5f0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1733232

Change-Id: Ic0e019951b7c639b621b999aaccfeed4263c68f0
2021-07-01 06:43:15 +00:00
Julien Desprez
c043be24a2 Merge "[WIP] Switch sh_test_host to unit_tests=true by default" am: 2858af671d am: ee476eabda
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1750240

Change-Id: Ief2ea6138c40df26ab2d0af877690d393730d0da
2021-07-01 02:45:48 +00:00
Julien Desprez
ee476eabda Merge "[WIP] Switch sh_test_host to unit_tests=true by default" am: 2858af671d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1750240

Change-Id: I555dfac3aa421050b8d9473aecccef686c89245b
2021-07-01 02:32:51 +00:00
Rupert Shuttleworth
22b606b5f0 Add partial bp2build support for APEX targets.
Test: Added unit test

Change-Id: I93e2a25fa43eec1ffb8fb30c346a9b523195a0fd
2021-06-30 22:20:23 -04:00
Julien Desprez
2858af671d Merge "[WIP] Switch sh_test_host to unit_tests=true by default" 2021-07-01 02:15:13 +00:00
Spandan Das
7c64f9d56b Merge "Add errorHints to stdout when read-only file system errors are detected" am: 3a932550a3 am: 357c3952f7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1747594

Change-Id: Id093e0dc8abe0367e7618f241125055f68a7d14d
2021-07-01 01:27:19 +00:00
Spandan Das
357c3952f7 Merge "Add errorHints to stdout when read-only file system errors are detected" am: 3a932550a3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1747594

Change-Id: Ie5beeb4387c38e62f3b2d55cb5ed874a7091e220
2021-07-01 01:11:14 +00:00
Spandan Das
3a932550a3 Merge "Add errorHints to stdout when read-only file system errors are detected" 2021-06-30 23:52:19 +00:00
Maxim Pleshivenkov
d2b51f3b8b Added quotes to protect wildcard am: 9d773841c9 am: 7dcc124a75
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1752900

Change-Id: I5e1dc291d9e8833f35eadd9005c6405f6b8be7ae
2021-06-30 22:20:47 +00:00
Maxim Pleshivenkov
7dcc124a75 Added quotes to protect wildcard am: 9d773841c9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1752900

Change-Id: Ie24e6e82278b195e4ef8b9fc5d60466f33583d33
2021-06-30 22:07:06 +00:00
Paul Duffin
3f0290ef79 Support using java_sdk_library components in stub_libs
Previously, if a bootclasspath_fragment had both a java_sdk_library
module and one of its components in stub_libs properties they would be
treated as separate modules instead of simply different APIs from the
same module. That would result in them both providing stub dex jars to
"hiddenapi list" which would fail because it found duplicate
definitions of the same class.

e.g. Specifying something like this:
    api: {
        stub_libs: [
            "art.module.public.api",
        ],
    },
    core_platform_api: {
        stub_libs: [
            "art.module.public.api.stubs.module_lib",
        ],
    },

would cause "hiddenapi list" to fail because it would have been passed
paths to two dex jars (actually the same dex jar but that does not
matter) each of which defined the same class, e.g. java.lang.Object.

This change treats the "art.module.public.api.stubs.module_lib" and
"art.module.public.api" modules as being the same for the purposes of
hidden API processing.

Bug: 192446466
Test: m nothing
Change-Id: I9de96337f64f26e24cff040d4bbed9eecc67b1ed
2021-06-30 19:36:52 +01:00
Maxim Pleshivenkov
9d773841c9 Added quotes to protect wildcard
When generating zip archive with zip2zip wildcard mask is specified.
Bash attempts to resolve wildcard **/*.class. If android build
top directory containts subfolder(s) with .class, bash wildcard
resolution  succeeds. Bash passes list of files to zip2zip instead
of actual wildcard. Created archive doesn't contain required files.

Adding quotes to wildcard to prvent that.

Bug: NA
Test: manual - build with coverage enabled
Change-Id: Iebdaa32693fe820f0f79588d61cb89660ea2b611
2021-06-30 14:29:49 -04:00
Colin Cross
247724099f Merge "Add default_shared_libs property" am: e19e6196b9 am: dc07b677eb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1743043

Change-Id: Ie6fc62d8460aaacff7a6b66d96c9ff21bffd96ef
2021-06-30 18:13:48 +00:00
Colin Cross
f2d6bdde9d Merge changes from topic "lint-update-7.1.0" am: 1dfd1039a5 am: 20389cda89
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1746720

Change-Id: Ib988b63de0391d14107442e6ab0bc56c03d527be
2021-06-30 18:12:52 +00:00
Colin Cross
2b8c5cd365 Filter srcjars out of srcFiles am: b0ef30ab4a am: 5da98c1c34
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1751182

Change-Id: I2bba227d8994d0da177829e19613a1f6134b0c6c
2021-06-30 18:12:47 +00:00
Colin Cross
dc07b677eb Merge "Add default_shared_libs property" am: e19e6196b9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1743043

Change-Id: If38e8a65565cd915394e009ee6043c6d71011dbf
2021-06-30 17:57:51 +00:00
Colin Cross
20389cda89 Merge changes from topic "lint-update-7.1.0" am: 1dfd1039a5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1746720

Change-Id: I5799fa4a73cced8e4a27ce1ee024bae65f8a9e70
2021-06-30 17:50:35 +00:00
Colin Cross
5da98c1c34 Filter srcjars out of srcFiles am: b0ef30ab4a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1751182

Change-Id: I162e10cf7455d2a3cee94b5a4e689d0321e677b6
2021-06-30 17:49:53 +00:00
Colin Cross
e19e6196b9 Merge "Add default_shared_libs property" 2021-06-30 14:27:20 +00:00
Colin Cross
1dfd1039a5 Merge changes from topic "lint-update-7.1.0"
* changes:
  Downgrade new errors from lint 7.1.0-dev to warnings
  Filter srcjars out of srcFiles
2021-06-30 14:25:21 +00:00
Anton Hansson
b648bc755c Merge "Remove kati marker in soong-only build" am: e6266e04f5 am: 5152ed29f1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1741174

Change-Id: Id49ae89d1106c36240508af19aac0656634ff105
2021-06-30 10:03:50 +00:00
Anton Hansson
5152ed29f1 Merge "Remove kati marker in soong-only build" am: e6266e04f5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1741174

Change-Id: I6dcb77617126e7eb4f8b894e17e480f291828f6a
2021-06-30 09:51:42 +00:00
Anton Hansson
e6266e04f5 Merge "Remove kati marker in soong-only build" 2021-06-30 09:33:49 +00:00
Treehugger Robot
48cb07a176 [automerger skipped] Merge "Ignore license and similar dependencies of prebuilt_apex/apex_set" am: 49387d5468 am: 20f9907a46 -s ours
am skip reason: Merged-In Iead6f9d1085d169335b88ceadcce2d8cc042254d with SHA-1 fee8cf36e3 is already in history

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

Change-Id: I8dd3bb22dd86330137a1dc3411f0c1c17950914a
2021-06-30 00:42:03 +00:00
Treehugger Robot
20f9907a46 Merge "Ignore license and similar dependencies of prebuilt_apex/apex_set" am: 49387d5468
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1748052

Change-Id: I0816a42b23e10b0acc99723706fc8af292c288a6
2021-06-30 00:36:59 +00:00
Colin Cross
cd872b7e1f Merge "Reland "Consistently prepend arch-specific headers"" am: dd8b6911ac am: 90e658ef14
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1750981

Change-Id: I686a8ded670229c6fff2c6f7d91d75346e6a6f96
2021-06-30 00:30:42 +00:00
Colin Cross
90e658ef14 Merge "Reland "Consistently prepend arch-specific headers"" am: dd8b6911ac
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1750981

Change-Id: I21a16b3618278fcfcb7a6805d565005ea7ff4988
2021-06-30 00:30:29 +00:00
Filip
1983f4389f Consistent soong namescape example am: 87112d6aca am: d4b249ae2b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1751548

Change-Id: I7116aec9006fce069439b6991ab20dc5e547a15e
2021-06-30 00:30:25 +00:00
Treehugger Robot
49387d5468 Merge "Ignore license and similar dependencies of prebuilt_apex/apex_set" 2021-06-30 00:25:39 +00:00
Colin Cross
dd8b6911ac Merge "Reland "Consistently prepend arch-specific headers"" 2021-06-30 00:19:56 +00:00
Filip
d4b249ae2b Consistent soong namescape example am: 87112d6aca
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1751548

Change-Id: I6b4ac17e08367a9383a528dd6a1ac6f20275f800
2021-06-30 00:14:34 +00:00
Paul Duffin
46ab291f67 Ignore license and similar dependencies of prebuilt_apex/apex_set
Previously, when determining which dependencies, direct or transitive,
of a prebuilt_apex/apex_set required APEX variants the code assumed
that all dependencies implemented ApexModule. While that is true for
the modules that can be explicitly mentioned in the exported...
properties it is not true for all of them. e.g. A
prebuilt_apex/apex_set can depend on license modules which do not
implement ApexModule.

This change simply ignores any module that does not implement
ApexModule.

Bug: 179354495
Test: m nothing
Merged-In: Iead6f9d1085d169335b88ceadcce2d8cc042254d
Change-Id: Iead6f9d1085d169335b88ceadcce2d8cc042254d
(cherry picked from commit fee8cf36e3)
2021-06-30 00:08:49 +01:00
Paul Duffin
d7be777f25 Ignore license and similar dependencies of prebuilt_apex/apex_set am: fee8cf36e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15132673

Change-Id: I88690c5637ab0e3a67415afa19fcfef0707b2b78
2021-06-29 23:06:29 +00:00
Paul Duffin
56c93e899a Use both module name and stem name to filter updatable boot jars
Sometimes the stem property is set to change both the installed file
name and the name use to filter the configured module list, e.g. when
adding a test library to replace the standard library, e.g. test_foo
instead of foo.

Sometimes it is used just to change the installed file name.

This change uses both to filter the updatable boot jars and not just
the stem.

Bug: 180105615
Test: m nothing
Change-Id: I6c459fc3597b1e4f062bc9a4e52843305b538c5f
2021-06-29 23:35:25 +01:00
satayev
783195cc5b Use system stubs for framework-doc-system-stubs.
The target is used to generate api_versions.xml file used by Android
Lint, point it to the system stubs in prebuilts/sdk/.

Bug: 190665366
Test: m framework-doc-system-stubs
Change-Id: I27fbad9eb1d84792901974674cbd85f0994bc9f1
2021-06-29 22:25:57 +01:00
Filip
87112d6aca Consistent soong namescape example
Test: not required - documentation change

Change-Id: Ib487278e7ca183fd968df70fb701a8cdf7266c19
2021-06-29 21:25:30 +00:00
Victor Chang
b54f5aa359 "module_current" and "system_server_current" should contain ART's @SystemApi(MODULE_LIBRARIES)
Before this fix, compiling a java_library against sdk_version:
"module_current" can't use the @SystemApi(MODULE_LIBRARIES) provided
by the ART module because the system module "core-current-stubs-system-modules"
contains only the public APIs.

Use the new system module with module lib APIs.

Bug: 183097033
Test: m droid
Change-Id: I274e2710d1ff34e896aa620bfafb4481180c53b5
2021-06-29 22:05:58 +01:00