projects
/
platform
/
upstream
/
libvpx.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
59681be
)
Android.mk: add a flag to control shared/static lib
author
James Zern
<jzern@google.com>
Thu, 9 Apr 2015 04:03:36 +0000
(21:03 -0700)
committer
James Zern
<jzern@google.com>
Thu, 9 Apr 2015 04:03:36 +0000
(21:03 -0700)
ndk-build ENABLE_SHARED=1 ...
Change-Id: Idd64804b165d0d4bbfb0b242d6c4eee5e828dab4
build/make/Android.mk
patch
|
blob
|
history
diff --git
a/build/make/Android.mk
b/build/make/Android.mk
index
d897b44
..
3d3f57d
100644
(file)
--- a/
build/make/Android.mk
+++ b/
build/make/Android.mk
@@
-184,7
+184,11
@@
clean:
@$(RM) -r $(ASM_CNV_PATH)
@$(RM) $(CLEAN-OBJS)
-include $(BUILD_SHARED_LIBRARY)
+ifeq ($(ENABLE_SHARED),1)
+ include $(BUILD_SHARED_LIBRARY)
+else
+ include $(BUILD_STATIC_LIBRARY)
+endif
ifeq ($(CONFIG_RUNTIME_CPU_DETECT),yes)
$(call import-module,cpufeatures)