diff options
| author | Kenny Root <kroot@google.com> | 2013-04-23 15:50:31 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2013-04-29 11:20:50 -0700 |
| commit | 38375a4d0b3d34e2babbd2f6a013976c7c439696 (patch) | |
| tree | 204aaa255b2578b71de8ab595f7efccf27bfd6d4 /NativeCode.mk | |
| parent | f2068d4c93e59742565349b1701cf2b64b06ec30 (diff) | |
| download | libcore-38375a4d0b3d34e2babbd2f6a013976c7c439696.zip libcore-38375a4d0b3d34e2babbd2f6a013976c7c439696.tar.gz libcore-38375a4d0b3d34e2babbd2f6a013976c7c439696.tar.bz2 | |
Move JSSE to new package
To help with shipping the JSSE with apps that want to bundle it, move
it to a new package so that the tangles in other parts of the library
can be untangled.
Change-Id: I810b6861388635301e28aee5b9b47b8e6b35b430
Diffstat (limited to 'NativeCode.mk')
| -rw-r--r-- | NativeCode.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/NativeCode.mk b/NativeCode.mk index b7c8b0e..5369453 100644 --- a/NativeCode.mk +++ b/NativeCode.mk @@ -82,7 +82,7 @@ core_src_files := # Include the sub.mk files. $(foreach dir, \ - dalvik/src/main/native luni/src/main/native, \ + crypto/src/main/native dalvik/src/main/native luni/src/main/native, \ $(eval $(call include-core-native-dir,$(dir)))) # Extract out the allowed LOCAL_* variables. Note: $(sort) also @@ -90,7 +90,7 @@ $(foreach dir, \ core_c_includes := $(sort libcore/include $(LOCAL_C_INCLUDES) $(JNI_H_INCLUDE)) core_shared_libraries := $(sort $(LOCAL_SHARED_LIBRARIES)) core_static_libraries := $(sort $(LOCAL_STATIC_LIBRARIES)) - +core_cflags := -DJNI_JARJAR_PREFIX="com/android/" # # Build for the target (device). @@ -108,6 +108,7 @@ endif # Define the rules. LOCAL_SRC_FILES := $(core_src_files) +LOCAL_CFLAGS := $(core_cflags) LOCAL_C_INCLUDES := $(core_c_includes) LOCAL_SHARED_LIBRARIES := $(core_shared_libraries) libexpat libicuuc libicui18n libssl libcrypto libz libnativehelper LOCAL_STATIC_LIBRARIES := $(core_static_libraries) |