diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2012-04-24 14:27:28 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-04-24 14:27:28 -0700 |
commit | 6912887bc9c4dfc560998cfdb6a7b1ce6d629417 (patch) | |
tree | 0c0d22095fa79c32e0da665584fc472895ed0212 /NativeCode.mk | |
parent | d3990f07b1523c74d201d5971c7c2451fbe92a33 (diff) | |
parent | 617f435b7decc07c3721b45edb0f4e7c4c2e54a5 (diff) | |
download | libcore-6912887bc9c4dfc560998cfdb6a7b1ce6d629417.zip libcore-6912887bc9c4dfc560998cfdb6a7b1ce6d629417.tar.gz libcore-6912887bc9c4dfc560998cfdb6a7b1ce6d629417.tar.bz2 |
am 617f435b: am 8d778522: am 61f172cd: Merge "Simplify and speed up makefile."
* commit '617f435b7decc07c3721b45edb0f4e7c4c2e54a5':
Simplify and speed up makefile.
Diffstat (limited to 'NativeCode.mk')
-rw-r--r-- | NativeCode.mk | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/NativeCode.mk b/NativeCode.mk index 7c6dbfc..bee4658 100644 --- a/NativeCode.mk +++ b/NativeCode.mk @@ -21,13 +21,6 @@ # Common definitions for host and target. # -# Get the list of all native directories that contain sub.mk files. -# We're using "sub.mk" to make it clear that these are not typical -# android makefiles. -define all-core-native-dirs -$(patsubst %/sub.mk,%,$(shell cd $(LOCAL_PATH) && ls -d */src/$(1)/native/sub.mk 2> /dev/null)) -endef - # These two definitions are used to help sanity check what's put in # sub.mk. See, the "error" directives immediately below. core_magic_local_target := ...//::default:://... @@ -54,12 +47,6 @@ define include-core-native-dir LOCAL_SRC_FILES := endef -# Find any native directories containing sub.mk files. -core_native_dirs := $(strip $(call all-core-native-dirs,main)) -ifeq ($(core_native_dirs),) - $(error No native code defined for libcore) -endif - # Set up the default state. Note: We use CLEAR_VARS here, even though # we aren't quite defining a new rule yet, to make sure that the # sub.mk files don't see anything stray from the last rule that was @@ -70,7 +57,7 @@ core_src_files := # Include the sub.mk files. $(foreach dir, \ - $(core_native_dirs), \ + dalvik/src/main/native luni/src/main/native, \ $(eval $(call include-core-native-dir,$(dir)))) # Extract out the allowed LOCAL_* variables. Note: $(sort) also |