From 0342c582624a4695242771ea6a9cfbd4af3b16e8 Mon Sep 17 00:00:00 2001 From: Logan Chien Date: Tue, 10 Sep 2019 09:08:24 -0700 Subject: [PATCH] apex: Install nativeTest with soong_cc_prebuilt.mk This commit switches the build rule for APEX nativeTests from `$(BUILD_PREBUILT)` to `soong_cc_prebuilt.mk`. Since these are not real prebuilts, `soong_cc_prebuilt.mk` should be sufficient. Using `soong_cc_prebuilt.mk` also fixes a problem reported by prebuilt ELF checker because `LOCAL_SHARED_LIBRARIES` are not generated for nativeTests. Bug: 139525855 Test: lunch aosp_walleye-userdebug && make check-elf-files Change-Id: I7bfc29f9c2708896dad4e7cfc214480e1205a51e --- apex/apex.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apex/apex.go b/apex/apex.go index 1e99ff807..909852e22 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -1518,7 +1518,7 @@ func (a *apexBundle) androidMkForFiles(w io.Writer, name, moduleDir string, apex fmt.Fprintln(w, "LOCAL_SOONG_DEX_JAR :=", fi.builtFile.String()) fmt.Fprintln(w, "LOCAL_DEX_PREOPT := false") fmt.Fprintln(w, "include $(BUILD_SYSTEM)/soong_java_prebuilt.mk") - } else if fi.class == nativeSharedLib || fi.class == nativeExecutable { + } else if fi.class == nativeSharedLib || fi.class == nativeExecutable || fi.class == nativeTest { fmt.Fprintln(w, "LOCAL_MODULE_STEM :=", fi.builtFile.Base()) if cc, ok := fi.module.(*cc.Module); ok { if cc.UnstrippedOutputFile() != nil {