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

Commit df88173d authored by Jiakai Zhang's avatar Jiakai Zhang
Browse files

Support adding a library as both a JNI library and a regular library. 

Bug: 299087066
Test: m nothing
Change-Id: I6cafe23395b7306727a071ccefe3b189c56e928b
Merged-In: I6cafe23395b7306727a071ccefe3b189c56e928b
parent 64038069

apex/apex.go

+3 −0
Original line number Diff line number Diff line
@@ -2217,6 +2217,9 @@ func (vctx *visitorContext) normalizeFileInfo(mctx android.ModuleContext) { 
			// If a module is directly included and also transitively depended on

			// consider it as directly included.

			e.transitiveDep = e.transitiveDep && f.transitiveDep

			// If a module is added as both a JNI library and a regular shared library, consider it as a

			// JNI library.

			e.isJniLib = e.isJniLib || f.isJniLib

			encountered[dest] = e

		}

	}

apex/apex_test.go

+23 −2
Original line number Diff line number Diff line
@@ -7843,7 +7843,8 @@ func TestApexWithJniLibs(t *testing.T) { 
		apex {

			name: "myapex",

			key: "myapex.key",

			jni_libs: ["mylib", "libfoo.rust"],

			binaries: ["mybin"],

			jni_libs: ["mylib", "mylib3", "libfoo.rust"],

			updatable: false,

		}
@@ -7870,6 +7871,24 @@ func TestApexWithJniLibs(t *testing.T) { 
			apex_available: [ "myapex" ],

		}



		// Used as both a JNI library and a regular shared library.

		cc_library {

			name: "mylib3",

			srcs: ["mylib.cpp"],

			system_shared_libs: [],

			stl: "none",

			apex_available: [ "myapex" ],

		}



		cc_binary {

			name: "mybin",

			srcs: ["mybin.cpp"],

			shared_libs: ["mylib3"],

			system_shared_libs: [],

			stl: "none",

			apex_available: [ "myapex" ],

		}



		rust_ffi_shared {

			name: "libfoo.rust",

			crate_name: "foo",
@@ -7893,10 +7912,12 @@ func TestApexWithJniLibs(t *testing.T) { 


	rule := ctx.ModuleForTests("myapex", "android_common_myapex_image").Rule("apexManifestRule")

	// Notice mylib2.so (transitive dep) is not added as a jni_lib

	ensureEquals(t, rule.Args["opt"], "-a jniLibs libfoo.rust.so mylib.so")

	ensureEquals(t, rule.Args["opt"], "-a jniLibs libfoo.rust.so mylib.so mylib3.so")

	ensureExactContents(t, ctx, "myapex", "android_common_myapex_image", []string{

		"bin/mybin",

		"lib64/mylib.so",

		"lib64/mylib2.so",

		"lib64/mylib3.so",

		"lib64/libfoo.rust.so",

		"lib64/libc++.so", // auto-added to libfoo.rust by Soong

		"lib64/liblog.so", // auto-added to libfoo.rust by Soong