From 64fb526cd04396d7a9802f5a400eaf292022b7a2 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Wed, 5 May 2021 21:36:04 +0100 Subject: Add SOONG_SDK_SNAPSHOT_PREFER support By default the generated snapshot has prefer: false. Building it with SOONG_SDK_SNAPSHOT_PREFER=true will force it to generate prefer: true. Bug: 157884619 Test: m nothing m SOONG_SDK_SNAPSHOT_PREFER=true art-module-sdk - check the generated Android.bp file to make sure it contains prefer: true Change-Id: Ied297b32d9bd4822a140fa99016f38e234c50f64 --- sdk/sdk_test.go | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'sdk/sdk_test.go') diff --git a/sdk/sdk_test.go b/sdk/sdk_test.go index e9129e0c7..12545d666 100644 --- a/sdk/sdk_test.go +++ b/sdk/sdk_test.go @@ -517,6 +517,45 @@ java_import { jars: ["java/myjavalib.jar"], } +sdk_snapshot { + name: "mysdk@current", + visibility: ["//visibility:public"], + java_header_libs: ["mysdk_myjavalib@current"], +} + `), + ) + }) + + t.Run("SOONG_SDK_SNAPSHOT_PREFER=true", func(t *testing.T) { + result := android.GroupFixturePreparers( + preparer, + android.FixtureMergeEnv(map[string]string{ + "SOONG_SDK_SNAPSHOT_PREFER": "true", + }), + ).RunTest(t) + + checkZipFile(t, result, "out/soong/.intermediates/mysdk/common_os/mysdk-current.zip") + + CheckSnapshot(t, result, "mysdk", "", + checkAndroidBpContents(` +// This is auto-generated. DO NOT EDIT. + +java_import { + name: "mysdk_myjavalib@current", + sdk_member_name: "myjavalib", + visibility: ["//visibility:public"], + apex_available: ["//apex_available:platform"], + jars: ["java/myjavalib.jar"], +} + +java_import { + name: "myjavalib", + prefer: true, + visibility: ["//visibility:public"], + apex_available: ["//apex_available:platform"], + jars: ["java/myjavalib.jar"], +} + sdk_snapshot { name: "mysdk@current", visibility: ["//visibility:public"], -- cgit v1.2.3-59-g8ed1b