diff --git a/adb/Android.mk b/adb/Android.mk index 7c029be41..351232344 100644 --- a/adb/Android.mk +++ b/adb/Android.mk @@ -111,7 +111,7 @@ LOCAL_SANITIZE := $(adb_target_sanitize) # Even though we're building a static library (and thus there's no link step for # this to take effect), this adds the includes to our path. -LOCAL_STATIC_LIBRARIES := libcrypto_utils_static libcrypto_static libbase +LOCAL_STATIC_LIBRARIES := libcrypto_utils libcrypto libbase include $(BUILD_STATIC_LIBRARY) @@ -134,7 +134,7 @@ LOCAL_SANITIZE := $(adb_host_sanitize) # Even though we're building a static library (and thus there's no link step for # this to take effect), this adds the includes to our path. -LOCAL_STATIC_LIBRARIES := libcrypto_utils_static libcrypto_static libbase +LOCAL_STATIC_LIBRARIES := libcrypto_utils libcrypto libbase LOCAL_C_INCLUDES_windows := development/host/windows/usb/api/ LOCAL_MULTILIB := first @@ -154,7 +154,7 @@ LOCAL_SRC_FILES := \ shell_service_test.cpp \ LOCAL_SANITIZE := $(adb_target_sanitize) -LOCAL_STATIC_LIBRARIES := libadbd libcrypto_utils_static libcrypto_static +LOCAL_STATIC_LIBRARIES := libadbd libcrypto_utils libcrypto LOCAL_SHARED_LIBRARIES := liblog libbase libcutils include $(BUILD_NATIVE_TEST) @@ -194,8 +194,8 @@ LOCAL_SANITIZE := $(adb_host_sanitize) LOCAL_SHARED_LIBRARIES := libbase LOCAL_STATIC_LIBRARIES := \ libadb \ - libcrypto_utils_static \ - libcrypto_static \ + libcrypto_utils \ + libcrypto \ libcutils \ libdiagnose_usb \ @@ -257,8 +257,8 @@ LOCAL_SANITIZE := $(adb_host_sanitize) LOCAL_STATIC_LIBRARIES := \ libadb \ libbase \ - libcrypto_utils_static \ - libcrypto_static \ + libcrypto_utils \ + libcrypto \ libdiagnose_usb \ liblog \ @@ -334,8 +334,8 @@ LOCAL_STATIC_LIBRARIES := \ libsquashfs_utils \ libcutils \ libbase \ - libcrypto_utils_static \ - libcrypto_static \ + libcrypto_utils \ + libcrypto \ libminijail \ libdebuggerd_client \ diff --git a/fs_mgr/Android.mk b/fs_mgr/Android.mk index 7da3ca440..d6b699bdd 100644 --- a/fs_mgr/Android.mk +++ b/fs_mgr/Android.mk @@ -7,8 +7,8 @@ common_static_libraries := \ libfec \ libfec_rs \ libbase \ - libcrypto_utils_static \ - libcrypto_static \ + libcrypto_utils \ + libcrypto \ libext4_utils_static \ libsquashfs_utils \ libselinux diff --git a/init/Android.mk b/init/Android.mk index f83924e9b..4a8df320f 100644 --- a/init/Android.mk +++ b/init/Android.mk @@ -95,8 +95,8 @@ LOCAL_STATIC_LIBRARIES := \ libc \ libselinux \ liblog \ - libcrypto_utils_static \ - libcrypto_static \ + libcrypto_utils \ + libcrypto \ libc++_static \ libdl \ libsparse_static \ diff --git a/libcrypto_utils/Android.bp b/libcrypto_utils/Android.bp new file mode 100644 index 000000000..ca7bd3119 --- /dev/null +++ b/libcrypto_utils/Android.bp @@ -0,0 +1,37 @@ +// +// Copyright (C) 2016 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +cc_library { + name: "libcrypto_utils", + host_supported: true, + srcs: [ + "android_pubkey.c", + ], + cflags: [ + "-Wall", + "-Wextra", + "-Werror", + "-std=c99", + ], + local_include_dirs: ["include"], + export_include_dirs: ["include"], + shared_libs: ["libcrypto"], + target: { + windows: { + enabled: true, + }, + }, +} diff --git a/libcrypto_utils/Android.mk b/libcrypto_utils/Android.mk deleted file mode 100644 index b6d220443..000000000 --- a/libcrypto_utils/Android.mk +++ /dev/null @@ -1,56 +0,0 @@ -# -# Copyright (C) 2016 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_MODULE := libcrypto_utils -LOCAL_SRC_FILES := android_pubkey.c -LOCAL_CFLAGS := -Wall -Werror -Wextra -std=c99 -LOCAL_C_INCLUDES := $(LOCAL_PATH)/include -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include -LOCAL_SHARED_LIBRARIES := libcrypto -include $(BUILD_SHARED_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_MODULE := libcrypto_utils -LOCAL_SRC_FILES := android_pubkey.c -LOCAL_CFLAGS := -Wall -Werror -Wextra -std=c99 -LOCAL_C_INCLUDES := $(LOCAL_PATH)/include -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include -LOCAL_SHARED_LIBRARIES := libcrypto -include $(BUILD_HOST_SHARED_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_MODULE := libcrypto_utils_static -LOCAL_SRC_FILES := android_pubkey.c -LOCAL_CFLAGS := -Wall -Werror -Wextra -std=c99 -LOCAL_C_INCLUDES := $(LOCAL_PATH)/include -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include -LOCAL_STATIC_LIBRARIES := libcrypto -include $(BUILD_STATIC_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_MODULE := libcrypto_utils_static -LOCAL_MODULE_HOST_OS := darwin linux windows -LOCAL_SRC_FILES := android_pubkey.c -LOCAL_CFLAGS := -Wall -Werror -Wextra -std=c99 -LOCAL_C_INCLUDES := $(LOCAL_PATH)/include -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include -LOCAL_STATIC_LIBRARIES := libcrypto_static -include $(BUILD_HOST_STATIC_LIBRARY) - -include $(call all-makefiles-under,$(LOCAL_PATH))