diff options
| author | Kenny Root <kroot@google.com> | 2013-09-16 13:58:19 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2013-09-16 14:21:44 -0700 |
| commit | 58162773b0664d5c5acbc658df4fa1d99f14b691 (patch) | |
| tree | 51d90bd9946d65399c8ca0e8587a3192e4c88080 /Android.mk | |
| parent | 0a455b00964add31681d101091d40e049c543fee (diff) | |
| download | libcore-58162773b0664d5c5acbc658df4fa1d99f14b691.zip libcore-58162773b0664d5c5acbc658df4fa1d99f14b691.tar.gz libcore-58162773b0664d5c5acbc658df4fa1d99f14b691.tar.bz2 | |
Split Conscrypt makefile out from libcore
Change-Id: I6c12a0e038a86b186b5d88b9f0ff28b8480b4aed
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 13 |
1 files changed, 8 insertions, 5 deletions
@@ -15,6 +15,12 @@ LOCAL_PATH := $(call my-dir) +# +# Subprojects with separate makefiles +# + +subdirs := benchmarks crypto +subdir_makefiles := $(call all-named-subdir-makefiles,$(subdirs)) # # Include the definitions to build the Java code. @@ -36,11 +42,6 @@ include $(LOCAL_PATH)/NativeCode.mk include $(LOCAL_PATH)/CaCerts.mk # -# Include the definitions to build the caliper benchmarks. -# -include $(LOCAL_PATH)/benchmarks/Android.mk - -# # Disable test modules if LIBCORE_SKIP_TESTS environment variable is set. # @@ -72,3 +73,5 @@ ifeq ($(WITH_HOST_DALVIK),true) apache-harmony-tests-hostdex \ $(call intermediates-dir-for,JAVA_LIBRARIES,core-tests,,COMMON)/classes.jar endif + +include $(subdir_makefiles) |