aboutsummaryrefslogtreecommitdiff
path: root/Android.bp
AgeCommit message (Collapse)Author
2022-03-29Merge changes I8bc68d10,Ie6182fa4 am: 8fa5ddae14 am: b3f8ed74cbMartin Stjernholm
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/2046463 Change-Id: I8aa82d1940f989c98a4e8b2d59d6a393dc87a5a7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29Merge changes I8bc68d10,Ie6182fa4 am: 8fa5ddae14Martin Stjernholm
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/2046463 Change-Id: Ia46c9466fdd242f69bec23b39006e09d82eeaa3e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28Add module_java_test_import module type required by new ConscryptMartin Stjernholm
test-export snapshot. A new Conscrypt test-exports has a conscrypt-tests module that gets transformed to module_java_test_import. The old snapshot in prebuilts/runtime/mainline/conscrypt/test-exports was not produced by packages/modules/common/build/mainline_modules_sdks.py so didn't have any transformations. Since Conscrypt is an unbundled module its test and host exports do get transformed just like the SDK, even though they only go into prebuilts/runtime/mainline for use on master-art. Test: env TARGET_BUILD_APPS="com.android.i18n com.android.runtime com.android.tzdata" \ packages/modules/common/build/mainline_modules_sdks.sh \ --build-platform-sdks-for-mainline --build-release=latest Replace SDK snapshots under prebuilts/runtime/mainline with those produced in out/dist/bundled-mainline-sdks in a master-art tree, then `banchan com.android.art && m` Bug: 216762037 Change-Id: I8bc68d1063f3ce799123870d03de3fe691be2d69
2021-10-15Add module_prebuilt_systemserverclasspath_fragment.Jiakai Zhang
Bug: 194150908 Test: Presubmits Merged-In: I9f3e46966d6672cceb864be48301c7a63777563b Merged-In: I14455d0ca153139842224cf489965173d0d6491a Change-Id: I9f3e46966d6672cceb864be48301c7a63777563b (cherry picked from commit b152a49229e0a09c9fce3259cdba6de5a5b714b9)
2021-10-11Add module_prebuilt_systemserverclasspath_fragment.Jiakai Zhang
Bug: 194150908 Test: Presubmits Ignore-AOSP-First: This change should first go into master, then be cherry-picked back to AOSP, with an empty commit in sc-mainline-prod, in order to prevent this change from being merged into sc-mainline-prod. Change-Id: I9f3e46966d6672cceb864be48301c7a63777563b
2021-07-27Add soong config rules for more module rules.Mathew Inwood
We need to disable some such build rules to get SDK prebuilts working to add appropriate rules here to allow the enabled property to be overridden. Bug: 192556458 Test: m Change-Id: I0f28f57de6de7101dfbb2112451d4da24a7d8295
2021-07-26Add module_android_app_set type.Dario Freni
Bug: 194596436 Test: presubmit Change-Id: Ic2dc6d9903d29dfc617d59c4bead15aa5e648cab
2021-07-07Support module_build_from_source for more prebuilt types.Mathew Inwood
SDK prebuilts also need to support module_build_from_source for consistency with module artifacts. Add support for this to the build rules used by SDK prebuilts. Bug: 188427719 Bug: 192588050 Test: m nothing Change-Id: Idb3ed8b92217f05975fbbe208f38378ac1a8ab8b
2021-06-28Move soong variable to different repo.Dario Freni
packages/modules/common is a more appropriate repository for module-level changes. Bug: 191978129 Test: m Change-Id: I522b56e80fd87e259d29ad78b525d419c7f9130f
2021-04-14Add restrictive default visibility for module repoAnton Hansson
Avoid dependencies that the repo owners do not know about. Test: m nothing Change-Id: I9c24b33cd0dcd98850002d9ab86492f6175acf38