diff options
author | Nick Kralevich <nnk@google.com> | 2014-11-02 16:53:29 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-02 16:53:29 +0000 |
commit | 0a5105bd25fea456b5771520a532e2fce68c8c0a (patch) | |
tree | 1e88fb6945257b5850e4c8282226feaab0514250 /core/clear_vars.mk | |
parent | 5b3b4b86c59668fc17078ed7a8d3234cbc7b9e8c (diff) | |
parent | e4cbc2af5f476d9eb875253584260bed807acddf (diff) | |
download | build-0a5105bd25fea456b5771520a532e2fce68c8c0a.zip build-0a5105bd25fea456b5771520a532e2fce68c8c0a.tar.gz build-0a5105bd25fea456b5771520a532e2fce68c8c0a.tar.bz2 |
am e4cbc2af: Merge "Revert "Add support for prebuilt AARs."" into lmp-mr1-ub-dev
* commit 'e4cbc2af5f476d9eb875253584260bed807acddf':
Revert "Add support for prebuilt AARs."
Diffstat (limited to 'core/clear_vars.mk')
-rw-r--r-- | core/clear_vars.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/core/clear_vars.mk b/core/clear_vars.mk index 87adbb1..8ee7734 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -30,7 +30,6 @@ LOCAL_MODULE_TAGS:= LOCAL_SRC_FILES:= LOCAL_PREBUILT_OBJ_FILES:= LOCAL_STATIC_JAVA_LIBRARIES:= -LOCAL_STATIC_JAVA_AAR_LIBRARIES:= LOCAL_STATIC_LIBRARIES:= # Group static libraries with "-Wl,--start-group" and "-Wl,--end-group" when linking. LOCAL_GROUP_STATIC_LIBRARIES:= |