diff options
| author | Dan Albert <danalbert@google.com> | 2015-05-21 23:03:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-05-21 23:03:50 +0000 |
| commit | 36473768ef6996f2ddf767385a56964e3c88575d (patch) | |
| tree | 919ff4b6923f75748e1fb543e3ef4ad2b809688d /adb/Android.mk | |
| parent | db037bcd221c6116434f6ae555e65e6e1db77ff7 (diff) | |
| parent | e246219d0c9897b1c08204d6c535d5d341c4e7ee (diff) | |
| download | core-36473768ef6996f2ddf767385a56964e3c88575d.tar.gz core-36473768ef6996f2ddf767385a56964e3c88575d.tar.bz2 core-36473768ef6996f2ddf767385a56964e3c88575d.zip | |
Merge "Clean up adb_trace_init."
Diffstat (limited to 'adb/Android.mk')
| -rw-r--r-- | adb/Android.mk | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/adb/Android.mk b/adb/Android.mk index bb974d865..f03004195 100644 --- a/adb/Android.mk +++ b/adb/Android.mk @@ -77,6 +77,10 @@ LOCAL_SRC_FILES := \ LOCAL_SHARED_LIBRARIES := libbase +# Even though we're building a static library (and thus there's no link step for +# this to take effect), this adds the includes to our path. +LOCAL_STATIC_LIBRARIES := libbase + include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) @@ -91,8 +95,8 @@ LOCAL_SRC_FILES := \ LOCAL_SHARED_LIBRARIES := libbase # Even though we're building a static library (and thus there's no link step for -# this to take effect), this adds the SSL includes to our path. -LOCAL_STATIC_LIBRARIES := libcrypto_static +# this to take effect), this adds the includes to our path. +LOCAL_STATIC_LIBRARIES := libcrypto_static libbase ifeq ($(HOST_OS),windows) LOCAL_C_INCLUDES += development/host/windows/usb/api/ @@ -254,10 +258,10 @@ LOCAL_STATIC_LIBRARIES := \ libbase \ libfs_mgr \ liblog \ - libcutils \ - libc \ libmincrypt \ libselinux \ libext4_utils_static \ + libcutils \ + libbase \ include $(BUILD_EXECUTABLE) |