Merge "applypatch: Move to Soong."
This commit is contained in:
Tao Bao
Gerrit Code Review
commit
b058c5c481
4 changed files with 196 additions and 197 deletions
|
|
@ -1,4 +1,5 @@
|
|||
subdirs = [
|
||||
"applypatch",
|
||||
"bootloader_message",
|
||||
"edify",
|
||||
"otafault",
|
||||
|
|
|
|||
|
|
@ -258,7 +258,6 @@ LOCAL_MODULE := librecovery_ui_vr
|
|||
include $(BUILD_STATIC_LIBRARY)
|
||||
|
||||
include \
|
||||
$(LOCAL_PATH)/applypatch/Android.mk \
|
||||
$(LOCAL_PATH)/boot_control/Android.mk \
|
||||
$(LOCAL_PATH)/minadbd/Android.mk \
|
||||
$(LOCAL_PATH)/minui/Android.mk \
|
||||
|
|
|
|||
195
applypatch/Android.bp
Normal file
195
applypatch/Android.bp
Normal file
|
|
@ -0,0 +1,195 @@
|
|||
// Copyright (C) 2017 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_defaults {
|
||||
name: "applypatch_defaults",
|
||||
|
||||
cflags: [
|
||||
"-D_FILE_OFFSET_BITS=64",
|
||||
"-DZLIB_CONST",
|
||||
"-Wall",
|
||||
"-Werror",
|
||||
],
|
||||
|
||||
local_include_dirs: [
|
||||
"include",
|
||||
],
|
||||
}
|
||||
|
||||
cc_library_static {
|
||||
name: "libapplypatch",
|
||||
|
||||
defaults: [
|
||||
"applypatch_defaults",
|
||||
],
|
||||
|
||||
srcs: [
|
||||
"applypatch.cpp",
|
||||
"bspatch.cpp",
|
||||
"freecache.cpp",
|
||||
"imgpatch.cpp",
|
||||
],
|
||||
|
||||
export_include_dirs: [
|
||||
"include",
|
||||
],
|
||||
|
||||
static_libs: [
|
||||
"libbase",
|
||||
"libbspatch",
|
||||
"libbz",
|
||||
"libcrypto",
|
||||
"libedify",
|
||||
"libotafault",
|
||||
"libotautil",
|
||||
"libz",
|
||||
],
|
||||
}
|
||||
|
||||
cc_library_static {
|
||||
name: "libapplypatch_modes",
|
||||
|
||||
defaults: [
|
||||
"applypatch_defaults",
|
||||
],
|
||||
|
||||
srcs: [
|
||||
"applypatch_modes.cpp",
|
||||
],
|
||||
|
||||
static_libs: [
|
||||
"libapplypatch",
|
||||
"libbase",
|
||||
"libcrypto",
|
||||
"libedify",
|
||||
"libotautil",
|
||||
],
|
||||
}
|
||||
|
||||
cc_binary {
|
||||
name: "applypatch",
|
||||
|
||||
defaults: [
|
||||
"applypatch_defaults",
|
||||
],
|
||||
|
||||
srcs: [
|
||||
"applypatch_main.cpp",
|
||||
],
|
||||
|
||||
static_libs: [
|
||||
"libapplypatch_modes",
|
||||
"libapplypatch",
|
||||
"libedify",
|
||||
"libotafault",
|
||||
"libotautil",
|
||||
"libbspatch",
|
||||
],
|
||||
|
||||
shared_libs: [
|
||||
"libbase",
|
||||
"libbz",
|
||||
"libcrypto",
|
||||
"liblog",
|
||||
"libz",
|
||||
"libziparchive",
|
||||
],
|
||||
}
|
||||
|
||||
cc_library_static {
|
||||
name: "libimgdiff",
|
||||
|
||||
host_supported: true,
|
||||
|
||||
defaults: [
|
||||
"applypatch_defaults",
|
||||
],
|
||||
|
||||
srcs: [
|
||||
"imgdiff.cpp",
|
||||
],
|
||||
|
||||
export_include_dirs: [
|
||||
"include",
|
||||
],
|
||||
|
||||
static_libs: [
|
||||
"libbase",
|
||||
"libbsdiff",
|
||||
"libdivsufsort",
|
||||
"libdivsufsort64",
|
||||
"liblog",
|
||||
"libotautil",
|
||||
"libutils",
|
||||
"libz",
|
||||
"libziparchive",
|
||||
],
|
||||
}
|
||||
|
||||
cc_binary_host {
|
||||
name: "imgdiff",
|
||||
|
||||
srcs: [
|
||||
"imgdiff_main.cpp",
|
||||
],
|
||||
|
||||
defaults: [
|
||||
"applypatch_defaults",
|
||||
],
|
||||
|
||||
static_libs: [
|
||||
"libimgdiff",
|
||||
"libbsdiff",
|
||||
"libdivsufsort",
|
||||
"libdivsufsort64",
|
||||
"libziparchive",
|
||||
"libbase",
|
||||
"libutils",
|
||||
"liblog",
|
||||
"libbz",
|
||||
"libz",
|
||||
],
|
||||
}
|
||||
|
||||
cc_library_static {
|
||||
name: "libimgpatch",
|
||||
|
||||
// The host module is for recovery_host_test (Linux only).
|
||||
host_supported: true,
|
||||
|
||||
defaults: [
|
||||
"applypatch_defaults",
|
||||
],
|
||||
|
||||
srcs: [
|
||||
"bspatch.cpp",
|
||||
"imgpatch.cpp",
|
||||
],
|
||||
|
||||
static_libs: [
|
||||
"libbase",
|
||||
"libbspatch",
|
||||
"libbz",
|
||||
"libcrypto",
|
||||
"libedify",
|
||||
"libotautil",
|
||||
"libz",
|
||||
],
|
||||
|
||||
target: {
|
||||
darwin: {
|
||||
enabled: false,
|
||||
},
|
||||
},
|
||||
}
|
||||
|
|
@ -1,196 +0,0 @@
|
|||
# Copyright (C) 2008 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)
|
||||
|
||||
# libapplypatch (static library)
|
||||
# ===============================
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_SRC_FILES := \
|
||||
applypatch.cpp \
|
||||
bspatch.cpp \
|
||||
freecache.cpp \
|
||||
imgpatch.cpp
|
||||
LOCAL_MODULE := libapplypatch
|
||||
LOCAL_MODULE_TAGS := eng
|
||||
LOCAL_C_INCLUDES := \
|
||||
$(LOCAL_PATH)/include
|
||||
LOCAL_EXPORT_C_INCLUDE_DIRS := \
|
||||
$(LOCAL_PATH)/include
|
||||
LOCAL_STATIC_LIBRARIES := \
|
||||
libedify \
|
||||
libotafault \
|
||||
libotautil \
|
||||
libbase \
|
||||
libcrypto \
|
||||
libbspatch \
|
||||
libbz \
|
||||
libz
|
||||
LOCAL_CFLAGS := \
|
||||
-DZLIB_CONST \
|
||||
-Wall \
|
||||
-Werror
|
||||
include $(BUILD_STATIC_LIBRARY)
|
||||
|
||||
# libimgpatch (static library)
|
||||
# ===============================
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_SRC_FILES := \
|
||||
bspatch.cpp \
|
||||
imgpatch.cpp
|
||||
LOCAL_MODULE := libimgpatch
|
||||
LOCAL_C_INCLUDES := \
|
||||
$(LOCAL_PATH)/include
|
||||
LOCAL_EXPORT_C_INCLUDE_DIRS := \
|
||||
$(LOCAL_PATH)/include
|
||||
LOCAL_STATIC_LIBRARIES := \
|
||||
libedify \
|
||||
libotautil \
|
||||
libcrypto \
|
||||
libbspatch \
|
||||
libbase \
|
||||
libbz \
|
||||
libz
|
||||
LOCAL_CFLAGS := \
|
||||
-DZLIB_CONST \
|
||||
-Wall \
|
||||
-Werror
|
||||
include $(BUILD_STATIC_LIBRARY)
|
||||
|
||||
# libimgpatch (host static library)
|
||||
# ===============================
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_SRC_FILES := \
|
||||
bspatch.cpp \
|
||||
imgpatch.cpp
|
||||
LOCAL_MODULE := libimgpatch
|
||||
LOCAL_MODULE_HOST_OS := linux
|
||||
LOCAL_C_INCLUDES := \
|
||||
$(LOCAL_PATH)/include
|
||||
LOCAL_EXPORT_C_INCLUDE_DIRS := \
|
||||
$(LOCAL_PATH)/include
|
||||
LOCAL_STATIC_LIBRARIES := \
|
||||
libedify \
|
||||
libotautil \
|
||||
libcrypto \
|
||||
libbspatch \
|
||||
libbase \
|
||||
libbz \
|
||||
libz
|
||||
LOCAL_CFLAGS := \
|
||||
-DZLIB_CONST \
|
||||
-Wall \
|
||||
-Werror
|
||||
include $(BUILD_HOST_STATIC_LIBRARY)
|
||||
|
||||
# libapplypatch_modes (static library)
|
||||
# ===============================
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_SRC_FILES := \
|
||||
applypatch_modes.cpp
|
||||
LOCAL_MODULE := libapplypatch_modes
|
||||
LOCAL_STATIC_LIBRARIES := \
|
||||
libapplypatch \
|
||||
libotautil \
|
||||
libbase \
|
||||
libedify \
|
||||
libcrypto
|
||||
LOCAL_CFLAGS := -Wall -Werror
|
||||
include $(BUILD_STATIC_LIBRARY)
|
||||
|
||||
# applypatch (target executable)
|
||||
# ===============================
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_SRC_FILES := applypatch_main.cpp
|
||||
LOCAL_MODULE := applypatch
|
||||
LOCAL_STATIC_LIBRARIES := \
|
||||
libapplypatch_modes \
|
||||
libapplypatch \
|
||||
libedify \
|
||||
libotafault \
|
||||
libotautil \
|
||||
libbspatch
|
||||
LOCAL_SHARED_LIBRARIES := \
|
||||
libbase \
|
||||
libbz \
|
||||
libcrypto \
|
||||
liblog \
|
||||
libz \
|
||||
libziparchive
|
||||
LOCAL_CFLAGS := -Wall -Werror
|
||||
include $(BUILD_EXECUTABLE)
|
||||
|
||||
libimgdiff_src_files := imgdiff.cpp
|
||||
|
||||
# libbsdiff is compiled with -D_FILE_OFFSET_BITS=64.
|
||||
libimgdiff_cflags := \
|
||||
-Wall \
|
||||
-Werror \
|
||||
-D_FILE_OFFSET_BITS=64 \
|
||||
-DZLIB_CONST
|
||||
|
||||
libimgdiff_static_libraries := \
|
||||
libotautil \
|
||||
libbsdiff \
|
||||
libdivsufsort \
|
||||
libdivsufsort64 \
|
||||
libziparchive \
|
||||
libutils \
|
||||
liblog \
|
||||
libbase \
|
||||
libz
|
||||
|
||||
# libimgdiff (static library)
|
||||
# ===============================
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_SRC_FILES := \
|
||||
$(libimgdiff_src_files)
|
||||
LOCAL_MODULE := libimgdiff
|
||||
LOCAL_CFLAGS := \
|
||||
$(libimgdiff_cflags)
|
||||
LOCAL_STATIC_LIBRARIES := \
|
||||
$(libimgdiff_static_libraries)
|
||||
LOCAL_C_INCLUDES := \
|
||||
$(LOCAL_PATH)/include
|
||||
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
|
||||
include $(BUILD_STATIC_LIBRARY)
|
||||
|
||||
# libimgdiff (host static library)
|
||||
# ===============================
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_SRC_FILES := \
|
||||
$(libimgdiff_src_files)
|
||||
LOCAL_MODULE := libimgdiff
|
||||
LOCAL_CFLAGS := \
|
||||
$(libimgdiff_cflags)
|
||||
LOCAL_STATIC_LIBRARIES := \
|
||||
$(libimgdiff_static_libraries)
|
||||
LOCAL_C_INCLUDES := \
|
||||
$(LOCAL_PATH)/include
|
||||
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
|
||||
include $(BUILD_HOST_STATIC_LIBRARY)
|
||||
|
||||
# imgdiff (host static executable)
|
||||
# ===============================
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_SRC_FILES := imgdiff_main.cpp
|
||||
LOCAL_MODULE := imgdiff
|
||||
LOCAL_CFLAGS := -Wall -Werror
|
||||
LOCAL_STATIC_LIBRARIES := \
|
||||
libimgdiff \
|
||||
$(libimgdiff_static_libraries) \
|
||||
libbz
|
||||
LOCAL_C_INCLUDES := \
|
||||
$(LOCAL_PATH)/include
|
||||
include $(BUILD_HOST_EXECUTABLE)
|
||||
Loading…
Reference in a new issue