commit 4b9f4d6ea08ce778641a97e99c3e73a113a53ac7
author Treehugger Robot <treehugger-gerrit@google.com> Wed Sep 11 02:28:53 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 11 02:28:53 2019 +0000
tree e25a6bbfd67c27339cbf31a1c71d8460f4f291fd
parent c706a186cce29ed6a4d22db729595c8a1f5feb17
parent 0342c582624a4695242771ea6a9cfbd4af3b16e8

Merge "apex: Install nativeTest with soong_cc_prebuilt.mk"

apex/apex.go

diff --git a/apex/apex.go b/apex/apex.go
index 1e99ff8..909852e 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -1518,7 +1518,7 @@
 			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 {