diff options
| author | Bertrand SIMONNET <bsimonnet@google.com> | 2015-07-24 15:25:24 -0700 |
|---|---|---|
| committer | Bertrand SIMONNET <bsimonnet@google.com> | 2015-07-31 13:30:03 -0700 |
| commit | 9f896b56af9b894b178ddc5332058f6034ae6428 (patch) | |
| tree | 27352320019ef6544dd52244e67464f93fd149ca | |
| parent | 92466676f157f59423ecd0b49173d1f22b78d00a (diff) | |
| download | modp_b64-9f896b56af9b894b178ddc5332058f6034ae6428.tar.gz | |
Move header to modp_b64 subdir.
libchromeos imports modp_b64 via modp_b64/modp_b64.h. Moving it into a
subdirectory make the import cleaner.
(cherry-pick from b1e6e2024f4b05e9747556c0937d6770da74ba13)
Change-Id: Ib4b778bd103af1f75ea7ba5333e722a7699f91e7
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | modp_b64/modp_b64.h (renamed from modp_b64.h) | 0 |
3 files changed, 3 insertions, 0 deletions
@@ -19,6 +19,7 @@ LOCAL_MODULE := libmodpb64 LOCAL_SRC_FILES := modp_b64.cc LOCAL_CPP_EXTENSION := .cc LOCAL_CFLAGS := -Wall -Werror +LOCAL_C_INCLUDES := $(LOCAL_PATH)/modp_b64 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) include $(BUILD_STATIC_LIBRARY) @@ -27,5 +28,6 @@ LOCAL_MODULE := libmodpb64-host LOCAL_SRC_FILES := modp_b64.cc LOCAL_CPP_EXTENSION := .cc LOCAL_CFLAGS := -Wall -Werror +LOCAL_C_INCLUDES := $(LOCAL_PATH)/modp_b64 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) include $(BUILD_HOST_STATIC_LIBRARY) @@ -14,6 +14,7 @@ include common.mk +CXXFLAGS += -I$(SRC)/modp_b64/ CXX_STATIC_LIBRARY(libmodpb64.pie.a): $(CXX_OBJECTS) all: CXX_STATIC_LIBRARY(libmodpb64.pie.a) diff --git a/modp_b64.h b/modp_b64/modp_b64.h index 3270e5f..3270e5f 100644 --- a/modp_b64.h +++ b/modp_b64/modp_b64.h |