aboutsummaryrefslogtreecommitdiffstats
path: root/androidmk
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2018-05-04 19:05:02 -0700
committerDan Willemsen <dwillemsen@google.com>2018-05-05 13:06:40 -0700
commit75dec2291b73995ca4d4ddb1b828dfce7f959043 (patch)
tree3167c489a6596b4c2b574d76a5172ed4ff6f2240 /androidmk
parent11f12db82350c1207326f145aa31ac3d1c597852 (diff)
downloadbuild_soong-75dec2291b73995ca4d4ddb1b828dfce7f959043.tar.gz
build_soong-75dec2291b73995ca4d4ddb1b828dfce7f959043.tar.bz2
build_soong-75dec2291b73995ca4d4ddb1b828dfce7f959043.zip
Fix androidmk converting cc libraries
The java library rewrites should only happen for java modules, not cc modules. Test: Ran androidmk on a number of Android.mk files Change-Id: Ife2cfb5a69d7db37216671f08317033b99fcd3a1
Diffstat (limited to 'androidmk')
-rw-r--r--androidmk/cmd/androidmk/androidmk_test.go13
1 files changed, 13 insertions, 0 deletions
diff --git a/androidmk/cmd/androidmk/androidmk_test.go b/androidmk/cmd/androidmk/androidmk_test.go
index edf3d42f..37e2427c 100644
--- a/androidmk/cmd/androidmk/androidmk_test.go
+++ b/androidmk/cmd/androidmk/androidmk_test.go
@@ -576,6 +576,19 @@ include $(call all-makefiles-under,$(LOCAL_PATH))
}
`,
},
+ {
+ desc: "cc_library shared_libs",
+ in: `
+ include $(CLEAR_VARS)
+ LOCAL_SHARED_LIBRARIES := libfoo
+ include $(BUILD_SHARED_LIBRARY)
+ `,
+ expected: `
+ cc_library_shared {
+ shared_libs: ["libfoo"],
+ }
+ `,
+ },
}
func TestEndToEnd(t *testing.T) {