diff options
| author | Elliott Hughes <enh@google.com> | 2016-04-13 22:10:33 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-13 22:10:33 +0000 |
| commit | a60601a55ef0ee56c61f90896cccd724af53b51e (patch) | |
| tree | ea9c20e7c4cf8d1ed53bd7f48b61145feba0afc4 | |
| parent | 60e6bd85da97190f63868c5ec339f2189f1db9ab (diff) | |
| parent | 05a177c9f2bafbf91fdf837792e2c7935b89f0ad (diff) | |
| download | nvram-a60601a55ef0ee56c61f90896cccd724af53b51e.tar.gz | |
Move system/nvram from libmincrypt to libconstrainedcrypto. am: bfb09a0 am: 71a1aee
am: 05a177c
* commit '05a177c9f2bafbf91fdf837792e2c7935b89f0ad':
Move system/nvram from libmincrypt to libconstrainedcrypto.
Change-Id: I0af654e839e6008d2d168d7b22490baf72a2befc
| -rw-r--r-- | core/Android.mk | 4 | ||||
| -rw-r--r-- | core/nvram_manager.cpp | 2 | ||||
| -rw-r--r-- | core/tests/Android.mk | 2 | ||||
| -rw-r--r-- | hal/Android.mk | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/core/Android.mk b/core/Android.mk index f9bcb06..7eefb48 100644 --- a/core/Android.mk +++ b/core/Android.mk @@ -25,7 +25,7 @@ LOCAL_CFLAGS := -Wall -Werror -Wextra LOCAL_CLANG := true LOCAL_C_INCLUDES := $(LOCAL_PATH)/include LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include -LOCAL_STATIC_LIBRARIES := libmincrypt +LOCAL_STATIC_LIBRARIES := libconstrainedcrypto LOCAL_SHARED_LIBRARIES := libnvram-messages include $(BUILD_STATIC_LIBRARY) @@ -38,7 +38,7 @@ LOCAL_CFLAGS := -Wall -Werror -Wextra LOCAL_CLANG := true LOCAL_C_INCLUDES := $(LOCAL_PATH)/include LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include -LOCAL_STATIC_LIBRARIES := libmincrypt +LOCAL_STATIC_LIBRARIES := libconstrainedcrypto LOCAL_SHARED_LIBRARIES := libnvram-messages-host include $(BUILD_HOST_STATIC_LIBRARY) diff --git a/core/nvram_manager.cpp b/core/nvram_manager.cpp index e5f1c7c..d5aee05 100644 --- a/core/nvram_manager.cpp +++ b/core/nvram_manager.cpp @@ -21,7 +21,7 @@ extern "C" { #include <string.h> } // extern "C" -#include <mincrypt/sha256.h> +#include <constrainedcrypto/sha256.h> #include <nvram/core/logger.h> using namespace nvram::storage; diff --git a/core/tests/Android.mk b/core/tests/Android.mk index f3b19d8..ed956ba 100644 --- a/core/tests/Android.mk +++ b/core/tests/Android.mk @@ -24,6 +24,6 @@ LOCAL_SRC_FILES := \ nvram_manager_test.cpp LOCAL_CFLAGS := -Wall -Werror -Wextra -DHAS_GTEST LOCAL_CLANG := true -LOCAL_STATIC_LIBRARIES := libnvram-core-host libmincrypt +LOCAL_STATIC_LIBRARIES := libnvram-core-host libconstrainedcrypto LOCAL_SHARED_LIBRARIES := libnvram-messages-host include $(BUILD_HOST_NATIVE_TEST) diff --git a/hal/Android.mk b/hal/Android.mk index e7ba5a2..b23c9a9 100644 --- a/hal/Android.mk +++ b/hal/Android.mk @@ -55,7 +55,7 @@ LOCAL_SRC_FILES := \ fake_nvram_storage.cpp LOCAL_CLANG := true LOCAL_CFLAGS := -Wall -Werror -Wextra -LOCAL_STATIC_LIBRARIES := libnvram-core libmincrypt +LOCAL_STATIC_LIBRARIES := libnvram-core libconstrainedcrypto LOCAL_SHARED_LIBRARIES := libnvram-messages libminijail libcutils libbase LOCAL_INIT_RC := fake-nvram.rc LOCAL_REQUIRED_MODULES := fake-nvram-seccomp.policy |