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

Commit f596f71d authored by John Wu's avatar John Wu Committed by Gerrit Code Review
Browse files

Merge "[Ravenwood] Support java_defaults for ravenwood properties" into main

parents c96e3698 878b2fc6

java/java.go

+1 −0
Original line number Diff line number Diff line
@@ -3277,6 +3277,7 @@ func DefaultsFactory() android.Module { 
		&JavaApiLibraryProperties{},

		&bootclasspathFragmentProperties{},

		&SourceOnlyBootclasspathProperties{},

		&ravenwoodTestProperties{},

	)



	android.InitDefaultsModule(module)

java/ravenwood_test.go

+5 −1
Original line number Diff line number Diff line
@@ -162,12 +162,16 @@ func TestRavenwoodTest(t *testing.T) { 
			srcs: ["jni.cpp"],

			stem: "libpink",

		}

		java_defaults {

			name: "ravenwood-test-defaults",

			jni_libs: ["jni-lib2"],

		}

		android_ravenwood_test {

			name: "ravenwood-test",

			srcs: ["Test.java"],

			defaults: ["ravenwood-test-defaults"],

			jni_libs: [

				"jni-lib1",

				"jni-lib2",

				"ravenwood-runtime-jni2",

			],

			resource_apk: "app2",