Merge "Move a few modules to Soong."
This commit is contained in:
Treehugger Robot
Gerrit Code Review
commit
d408a865af
2 changed files with 145 additions and 83 deletions
143
Android.bp
Normal file
143
Android.bp
Normal file
|
|
@ -0,0 +1,143 @@
|
|||
// Copyright (C) 2018 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: "recovery_defaults",
|
||||
|
||||
cflags: [
|
||||
"-Wall",
|
||||
"-Werror",
|
||||
],
|
||||
}
|
||||
|
||||
// Generic device that uses ScreenRecoveryUI.
|
||||
cc_library_static {
|
||||
name: "librecovery_ui_default",
|
||||
|
||||
defaults: [
|
||||
"recovery_defaults",
|
||||
],
|
||||
|
||||
srcs: [
|
||||
"default_device.cpp",
|
||||
],
|
||||
}
|
||||
|
||||
// The default wear device that uses WearRecoveryUI.
|
||||
cc_library_static {
|
||||
name: "librecovery_ui_wear",
|
||||
|
||||
defaults: [
|
||||
"recovery_defaults",
|
||||
],
|
||||
|
||||
srcs: [
|
||||
"wear_device.cpp",
|
||||
],
|
||||
}
|
||||
|
||||
// The default VR device that uses VrRecoveryUI.
|
||||
cc_library_static {
|
||||
name: "librecovery_ui_vr",
|
||||
|
||||
defaults: [
|
||||
"recovery_defaults",
|
||||
],
|
||||
|
||||
srcs: [
|
||||
"vr_device.cpp",
|
||||
],
|
||||
}
|
||||
|
||||
cc_library_static {
|
||||
name: "libmounts",
|
||||
|
||||
defaults: [
|
||||
"recovery_defaults",
|
||||
],
|
||||
|
||||
srcs: [
|
||||
"mounts.cpp",
|
||||
],
|
||||
|
||||
static_libs: [
|
||||
"libbase",
|
||||
],
|
||||
}
|
||||
|
||||
cc_library_static {
|
||||
name: "libverifier",
|
||||
|
||||
defaults: [
|
||||
"recovery_defaults",
|
||||
],
|
||||
|
||||
srcs: [
|
||||
"asn1_decoder.cpp",
|
||||
"verifier.cpp",
|
||||
],
|
||||
|
||||
static_libs: [
|
||||
"libbase",
|
||||
"libcrypto",
|
||||
"libcrypto_utils",
|
||||
"libotautil",
|
||||
],
|
||||
}
|
||||
|
||||
// The dynamic executable that runs after /data mounts.
|
||||
cc_binary {
|
||||
name: "recovery-persist",
|
||||
|
||||
defaults: [
|
||||
"recovery_defaults",
|
||||
],
|
||||
|
||||
srcs: [
|
||||
"recovery-persist.cpp",
|
||||
"rotate_logs.cpp",
|
||||
],
|
||||
|
||||
shared_libs: [
|
||||
"libbase",
|
||||
"liblog",
|
||||
],
|
||||
|
||||
init_rc: [
|
||||
"recovery-persist.rc",
|
||||
],
|
||||
}
|
||||
|
||||
// The dynamic executable that runs at init.
|
||||
cc_binary {
|
||||
name: "recovery-refresh",
|
||||
|
||||
defaults: [
|
||||
"recovery_defaults",
|
||||
],
|
||||
|
||||
srcs: [
|
||||
"recovery-refresh.cpp",
|
||||
"rotate_logs.cpp",
|
||||
],
|
||||
|
||||
shared_libs: [
|
||||
"libbase",
|
||||
"liblog",
|
||||
],
|
||||
|
||||
init_rc: [
|
||||
"recovery-refresh.rc",
|
||||
],
|
||||
}
|
||||
85
Android.mk
85
Android.mk
|
|
@ -23,17 +23,6 @@ RECOVERY_FSTAB_VERSION := 2
|
|||
# librecovery_ui_default, which uses ScreenRecoveryUI.
|
||||
TARGET_RECOVERY_UI_LIB ?= librecovery_ui_default
|
||||
|
||||
# libmounts (static library)
|
||||
# ===============================
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_SRC_FILES := mounts.cpp
|
||||
LOCAL_CFLAGS := \
|
||||
-Wall \
|
||||
-Werror
|
||||
LOCAL_MODULE := libmounts
|
||||
LOCAL_STATIC_LIBRARIES := libbase
|
||||
include $(BUILD_STATIC_LIBRARY)
|
||||
|
||||
# librecovery (static library)
|
||||
# ===============================
|
||||
include $(CLEAR_VARS)
|
||||
|
|
@ -49,6 +38,7 @@ ifeq ($(AB_OTA_UPDATER),true)
|
|||
endif
|
||||
|
||||
LOCAL_MODULE := librecovery
|
||||
|
||||
LOCAL_STATIC_LIBRARIES := \
|
||||
libminui \
|
||||
libotautil \
|
||||
|
|
@ -72,6 +62,7 @@ LOCAL_SRC_FILES := \
|
|||
LOCAL_CFLAGS := -Wall -Werror
|
||||
|
||||
LOCAL_MODULE := librecovery_ui
|
||||
|
||||
LOCAL_STATIC_LIBRARIES := \
|
||||
libminui \
|
||||
libbase
|
||||
|
|
@ -201,78 +192,6 @@ endif
|
|||
|
||||
include $(BUILD_EXECUTABLE)
|
||||
|
||||
# recovery-persist (system partition dynamic executable run after /data mounts)
|
||||
# ===============================
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_SRC_FILES := \
|
||||
recovery-persist.cpp \
|
||||
rotate_logs.cpp
|
||||
LOCAL_MODULE := recovery-persist
|
||||
LOCAL_SHARED_LIBRARIES := liblog libbase
|
||||
LOCAL_CFLAGS := -Wall -Werror
|
||||
LOCAL_INIT_RC := recovery-persist.rc
|
||||
include $(BUILD_EXECUTABLE)
|
||||
|
||||
# recovery-refresh (system partition dynamic executable run at init)
|
||||
# ===============================
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_SRC_FILES := \
|
||||
recovery-refresh.cpp \
|
||||
rotate_logs.cpp
|
||||
LOCAL_MODULE := recovery-refresh
|
||||
LOCAL_SHARED_LIBRARIES := liblog libbase
|
||||
LOCAL_CFLAGS := -Wall -Werror
|
||||
LOCAL_INIT_RC := recovery-refresh.rc
|
||||
include $(BUILD_EXECUTABLE)
|
||||
|
||||
# libverifier (static library)
|
||||
# ===============================
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_MODULE := libverifier
|
||||
LOCAL_SRC_FILES := \
|
||||
asn1_decoder.cpp \
|
||||
verifier.cpp
|
||||
LOCAL_STATIC_LIBRARIES := \
|
||||
libotautil \
|
||||
libcrypto_utils \
|
||||
libcrypto \
|
||||
libbase
|
||||
LOCAL_CFLAGS := -Wall -Werror
|
||||
include $(BUILD_STATIC_LIBRARY)
|
||||
|
||||
# Generic device that uses ScreenRecoveryUI.
|
||||
# ===============================
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_SRC_FILES := default_device.cpp
|
||||
LOCAL_CFLAGS := -Wall -Werror
|
||||
|
||||
LOCAL_MODULE := librecovery_ui_default
|
||||
|
||||
include $(BUILD_STATIC_LIBRARY)
|
||||
|
||||
# Wear default device
|
||||
# ===============================
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_SRC_FILES := wear_device.cpp
|
||||
LOCAL_CFLAGS := -Wall -Werror
|
||||
|
||||
# Should match TARGET_RECOVERY_UI_LIB in BoardConfig.mk.
|
||||
LOCAL_MODULE := librecovery_ui_wear
|
||||
|
||||
include $(BUILD_STATIC_LIBRARY)
|
||||
|
||||
# vr headset default device
|
||||
# ===============================
|
||||
include $(CLEAR_VARS)
|
||||
|
||||
LOCAL_SRC_FILES := vr_device.cpp
|
||||
LOCAL_CFLAGS := -Wall -Werror
|
||||
|
||||
# should match TARGET_RECOVERY_UI_LIB set in BoardConfig.mk
|
||||
LOCAL_MODULE := librecovery_ui_vr
|
||||
|
||||
include $(BUILD_STATIC_LIBRARY)
|
||||
|
||||
include \
|
||||
$(LOCAL_PATH)/boot_control/Android.mk \
|
||||
$(LOCAL_PATH)/minui/Android.mk \
|
||||
|
|
|
|||
Loading…
Reference in a new issue