diff options
| author | Paul Duffin <paulduffin@google.com> | 2017-03-15 16:08:40 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-15 16:08:40 +0000 |
| commit | 3072f56bf961a429c217869c03845d15fc90ca6b (patch) | |
| tree | 5869af4d592f5e0e3b7b319008669f6ee9d68818 | |
| parent | db55101b385b9f5289697896df3f374620300b4a (diff) | |
| parent | 7d2fa18cfd9d254e73e31ca4674ee315d369f1a4 (diff) | |
| download | dexmaker-3072f56bf961a429c217869c03845d15fc90ca6b.tar.gz | |
Merge "Make Android.mk the same as downstream to avoid conflicts"
am: 7d2fa18cfd
Change-Id: I6328169ac2cd931aa0ac0f2b35b9873f9d1c83d5
| -rw-r--r-- | Android.mk | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -62,3 +62,5 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ dexmaker-tests include $(BUILD_PACKAGE) + +include $(call all-makefiles-under,$(LOCAL_PATH)) |