diff options
| author | Dan Albert <danalbert@google.com> | 2015-12-19 14:01:24 -0800 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2016-01-04 13:45:57 -0800 |
| commit | 7b6d965a213e6597a4210458e5c0a19ad27ea36e (patch) | |
| tree | 3e95a9476fe0fe4050a6de4cae9883ece367abe2 /sources | |
| parent | 05d01e444412ecf34237e2f5a27ae1126899d922 (diff) | |
| download | ndk-7b6d965a213e6597a4210458e5c0a19ad27ea36e.tar.gz | |
Restore the old package layout.
We haven't been able to finalize a new package layout, and we don't
want to change it twice. Restore the old layout until we can figure
out the new one.
Change-Id: I3082a0354b5f1f34456ba3a769b37257484e5f45
Diffstat (limited to 'sources')
| -rw-r--r-- | sources/cxx-stl/gnu-libstdc++/Android.mk | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sources/cxx-stl/gnu-libstdc++/Android.mk b/sources/cxx-stl/gnu-libstdc++/Android.mk index 2b94a8a41..5bb29d1ae 100644 --- a/sources/cxx-stl/gnu-libstdc++/Android.mk +++ b/sources/cxx-stl/gnu-libstdc++/Android.mk @@ -10,17 +10,17 @@ gnustl_exported_cppflags := $(strip \ # Include path to export gnustl_exported_c_includes := \ - $(LOCAL_PATH)/include \ - $(LOCAL_PATH)/libs/$(TARGET_ARCH_ABI)/include \ - $(LOCAL_PATH)/include/backward + $(LOCAL_PATH)/4.9/include \ + $(LOCAL_PATH)/4.9/libs/$(TARGET_ARCH_ABI)/include \ + $(LOCAL_PATH)/4.9/include/backward include $(CLEAR_VARS) LOCAL_MODULE := gnustl_static -LOCAL_SRC_FILES := libs/$(TARGET_ARCH_ABI)/libgnustl_static$(TARGET_LIB_EXTENSION) +LOCAL_SRC_FILES := 4.9/libs/$(TARGET_ARCH_ABI)/libgnustl_static$(TARGET_LIB_EXTENSION) # For armeabi*, choose thumb mode unless LOCAL_ARM_MODE := arm ifneq (,$(filter armeabi%,$(TARGET_ARCH_ABI))) ifneq (arm,$(LOCAL_ARM_MODE)) -LOCAL_SRC_FILES:= libs/$(TARGET_ARCH_ABI)/thumb/libgnustl_static$(TARGET_LIB_EXTENSION) +LOCAL_SRC_FILES:= 4.9/libs/$(TARGET_ARCH_ABI)/thumb/libgnustl_static$(TARGET_LIB_EXTENSION) endif endif LOCAL_EXPORT_CPPFLAGS := $(gnustl_exported_cppflags) @@ -29,14 +29,14 @@ include $(PREBUILT_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := gnustl_shared -LOCAL_SRC_FILES := libs/$(TARGET_ARCH_ABI)/libgnustl_shared$(TARGET_SONAME_EXTENSION) +LOCAL_SRC_FILES := 4.9/libs/$(TARGET_ARCH_ABI)/libgnustl_shared$(TARGET_SONAME_EXTENSION) # For armeabi*, choose thumb mode unless LOCAL_ARM_MODE := arm ifneq (,$(filter armeabi%,$(TARGET_ARCH_ABI))) ifneq (arm,$(LOCAL_ARM_MODE)) -LOCAL_SRC_FILES:= libs/$(TARGET_ARCH_ABI)/thumb/libgnustl_shared$(TARGET_SONAME_EXTENSION) +LOCAL_SRC_FILES:= 4.9/libs/$(TARGET_ARCH_ABI)/thumb/libgnustl_shared$(TARGET_SONAME_EXTENSION) endif endif LOCAL_EXPORT_CPPFLAGS := $(gnustl_exported_cppflags) LOCAL_EXPORT_C_INCLUDES := $(gnustl_exported_c_includes) -LOCAL_EXPORT_LDLIBS := $(call host-path,$(LOCAL_PATH)/libs/$(TARGET_ARCH_ABI)/libsupc++$(TARGET_LIB_EXTENSION)) +LOCAL_EXPORT_LDLIBS := $(call host-path,$(LOCAL_PATH)/4.9/libs/$(TARGET_ARCH_ABI)/libsupc++$(TARGET_LIB_EXTENSION)) include $(PREBUILT_SHARED_LIBRARY) |