Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a57bb10 authored by Paul Duffin's avatar Paul Duffin
Browse files

Only output annotations properties in snapshots for T+ 

Marks the `scopeProperties.AnnotationsZip` property as only being
supported on T builds and above.

Bug: 204763318
Test: m nothing
Merged-In: Ie59396287c08da77a6a1f15d4be202429e011e17
Change-Id: Ie59396287c08da77a6a1f15d4be202429e011e17
(cherry picked from commit a54016c3)
parent 56f266d2

java/sdk_library.go

+1 −1
Original line number Diff line number Diff line
@@ -2562,7 +2562,7 @@ type scopeProperties struct { 
	StubsSrcJar    android.Path

	CurrentApiFile android.Path

	RemovedApiFile android.Path

	AnnotationsZip android.Path

	AnnotationsZip android.Path `supported_build_releases:"T+"`

	SdkVersion     string

}

sdk/java_sdk_test.go

+52 −0
Original line number Diff line number Diff line
@@ -1253,6 +1253,58 @@ java_sdk_library_import { 
	)

}



func TestSnapshotWithJavaSdkLibrary_AnnotationsZip_PreT(t *testing.T) {

	result := android.GroupFixturePreparers(

		prepareForSdkTestWithJavaSdkLibrary,

		android.FixtureMergeEnv(map[string]string{

			"SOONG_SDK_SNAPSHOT_TARGET_BUILD_RELEASE": "S",

		}),

	).RunTestWithBp(t, `

		sdk {

			name: "mysdk",

			java_sdk_libs: ["myjavalib"],

		}



		java_sdk_library {

			name: "myjavalib",

			srcs: ["Test.java"],

			sdk_version: "current",

			shared_library: false,

			annotations_enabled: true,

			public: {

				enabled: true,

			},

		}

	`)



	CheckSnapshot(t, result, "mysdk", "",

		checkUnversionedAndroidBpContents(`

// This is auto-generated. DO NOT EDIT.



java_sdk_library_import {

    name: "myjavalib",

    prefer: false,

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    shared_library: false,

    public: {

        jars: ["sdk_library/public/myjavalib-stubs.jar"],

        stub_srcs: ["sdk_library/public/myjavalib_stub_sources"],

        current_api: "sdk_library/public/myjavalib.txt",

        removed_api: "sdk_library/public/myjavalib-removed.txt",

        sdk_version: "current",

    },

}

		`),

		checkAllCopyRules(`

.intermediates/myjavalib.stubs/android_common/javac/myjavalib.stubs.jar -> sdk_library/public/myjavalib-stubs.jar

.intermediates/myjavalib.stubs.source/android_common/metalava/myjavalib.stubs.source_api.txt -> sdk_library/public/myjavalib.txt

.intermediates/myjavalib.stubs.source/android_common/metalava/myjavalib.stubs.source_removed.txt -> sdk_library/public/myjavalib-removed.txt

		`),

		checkMergeZips(".intermediates/mysdk/common_os/tmp/sdk_library/public/myjavalib_stub_sources.zip"),

	)

}



func TestSnapshotWithJavaSdkLibrary_CompileDex(t *testing.T) {

	result := android.GroupFixturePreparers(prepareForSdkTestWithJavaSdkLibrary).RunTestWithBp(t, `

		sdk {