Revert "Move deprecated-ota code into a separate soong namespace"
This reverts commit 2d76106db4.
Reason for revert: DroidMonitor. Potential culprit for b/http://b/340564737 - verifying through ABTD before submission.
Change-Id: I4af43dcd8731694581c2cb9cc89dd11cdfcb8181
This commit is contained in:
Liana Kazanova
Android (Google) Code Review
parent
2d76106db4
commit
20a288a59f
6 changed files with 118 additions and 110 deletions
58
Android.bp
58
Android.bp
|
|
@ -1,58 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2021 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.
|
||||
*/
|
||||
|
||||
soong_namespace {}
|
||||
|
||||
// Added automatically by a large-scale-change that took the approach of
|
||||
// 'apply every license found to every target'. While this makes sure we respect
|
||||
// every license restriction, it may not be entirely correct.
|
||||
//
|
||||
// e.g. GPL in an MIT project might only apply to the contrib/ directory.
|
||||
//
|
||||
// Please consider splitting the single license below into multiple licenses,
|
||||
// taking care not to lose any license_kind information, and overriding the
|
||||
// default license using the 'licenses: [...]' property on targets as needed.
|
||||
//
|
||||
// For unused files, consider creating a 'fileGroup' with "//visibility:private"
|
||||
// to attach the license to, and including a comment whether the files may be
|
||||
// used in the current project.
|
||||
// See: http://go/android-license-faq
|
||||
license {
|
||||
name: "bootable_recovery_license",
|
||||
visibility: [":__subpackages__"],
|
||||
license_kinds: [
|
||||
"SPDX-license-identifier-Apache-2.0",
|
||||
"SPDX-license-identifier-MIT",
|
||||
"SPDX-license-identifier-OFL", // by exception only
|
||||
],
|
||||
license_text: [
|
||||
"NOTICE",
|
||||
],
|
||||
}
|
||||
|
||||
cc_defaults {
|
||||
name: "recovery_defaults",
|
||||
|
||||
cflags: [
|
||||
"-D_FILE_OFFSET_BITS=64",
|
||||
|
||||
// Must be the same as RECOVERY_API_VERSION.
|
||||
"-DRECOVERY_API_VERSION=3",
|
||||
|
||||
"-Wall",
|
||||
"-Werror",
|
||||
],
|
||||
}
|
||||
|
|
@ -12,58 +12,6 @@
|
|||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
cc_defaults {
|
||||
name: "recovery_test_defaults",
|
||||
|
||||
defaults: [
|
||||
"recovery_defaults",
|
||||
],
|
||||
|
||||
include_dirs: [
|
||||
"bootable/recovery",
|
||||
],
|
||||
|
||||
shared_libs: [
|
||||
"libbase",
|
||||
"libcrypto",
|
||||
"libcutils",
|
||||
"liblog",
|
||||
"libpng",
|
||||
"libprocessgroup",
|
||||
"libselinux",
|
||||
"libziparchive",
|
||||
],
|
||||
|
||||
target: {
|
||||
android: {
|
||||
shared_libs: [
|
||||
"libutils",
|
||||
"libvndksupport",
|
||||
],
|
||||
},
|
||||
|
||||
host: {
|
||||
static_libs: [
|
||||
"libutils",
|
||||
],
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
// recovery image for unittests.
|
||||
// ========================================================
|
||||
genrule {
|
||||
name: "recovery_image",
|
||||
cmd: "cat $(location testdata/recovery_head) <(cat $(location testdata/recovery_body) | gzip) $(location testdata/recovery_tail) > $(out)",
|
||||
srcs: [
|
||||
"testdata/recovery_head",
|
||||
"testdata/recovery_body",
|
||||
"testdata/recovery_tail",
|
||||
],
|
||||
out: [
|
||||
"testdata/recovery.img",
|
||||
],
|
||||
}
|
||||
|
||||
cc_test_host {
|
||||
name: "recovery_host_test",
|
||||
|
|
|
|||
BIN
tests/testdata/recovery_body
vendored
BIN
tests/testdata/recovery_body
vendored
Binary file not shown.
BIN
tests/testdata/recovery_head
vendored
BIN
tests/testdata/recovery_head
vendored
Binary file not shown.
BIN
tests/testdata/recovery_tail
vendored
BIN
tests/testdata/recovery_tail
vendored
Binary file not shown.
118
updater/Android.mk
Normal file
118
updater/Android.mk
Normal file
|
|
@ -0,0 +1,118 @@
|
|||
# Copyright 2009 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)
|
||||
|
||||
tune2fs_static_libraries := \
|
||||
libext2_com_err \
|
||||
libext2_blkid \
|
||||
libext2_quota \
|
||||
libext2_uuid \
|
||||
libext2_e2p \
|
||||
libext2fs
|
||||
|
||||
updater_common_static_libraries := \
|
||||
libapplypatch \
|
||||
libbootloader_message \
|
||||
libbspatch \
|
||||
libedify \
|
||||
libotautil \
|
||||
libext4_utils \
|
||||
libdm \
|
||||
libfec \
|
||||
libfec_rs \
|
||||
libavb \
|
||||
libverity_tree \
|
||||
liblog \
|
||||
liblp \
|
||||
libselinux \
|
||||
libsparse \
|
||||
libsquashfs_utils \
|
||||
libbrotli \
|
||||
libbz \
|
||||
libziparchive \
|
||||
libz_stable \
|
||||
libbase \
|
||||
libcrypto_static \
|
||||
libcrypto_utils \
|
||||
libcutils \
|
||||
libutils
|
||||
|
||||
|
||||
# Each library in TARGET_RECOVERY_UPDATER_LIBS should have a function
|
||||
# named "Register_<libname>()". Here we emit a little C function that
|
||||
# gets #included by updater.cpp. It calls all those registration
|
||||
# functions.
|
||||
# $(1): the path to the register.inc file
|
||||
# $(2): a list of TARGET_RECOVERY_UPDATER_LIBS
|
||||
define generate-register-inc
|
||||
$(hide) mkdir -p $(dir $(1))
|
||||
$(hide) echo "" > $(1)
|
||||
$(hide) $(foreach lib,$(2),echo "extern void Register_$(lib)(void);" >> $(1);)
|
||||
$(hide) echo "void RegisterDeviceExtensions() {" >> $(1)
|
||||
$(hide) $(foreach lib,$(2),echo " Register_$(lib)();" >> $(1);)
|
||||
$(hide) echo "}" >> $(1)
|
||||
endef
|
||||
|
||||
|
||||
# updater (static executable)
|
||||
# ===============================
|
||||
include $(CLEAR_VARS)
|
||||
|
||||
LOCAL_MODULE := updater
|
||||
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
|
||||
LOCAL_LICENSE_CONDITIONS := notice
|
||||
LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../NOTICE
|
||||
|
||||
LOCAL_SRC_FILES := \
|
||||
updater_main.cpp
|
||||
|
||||
LOCAL_C_INCLUDES := \
|
||||
$(LOCAL_PATH)/include
|
||||
|
||||
LOCAL_CFLAGS := \
|
||||
-Wall \
|
||||
-Werror
|
||||
|
||||
LOCAL_STATIC_LIBRARIES := \
|
||||
libupdater_device \
|
||||
libupdater_core \
|
||||
$(TARGET_RECOVERY_UPDATER_LIBS) \
|
||||
$(TARGET_RECOVERY_UPDATER_EXTRA_LIBS) \
|
||||
$(updater_common_static_libraries) \
|
||||
libfs_mgr \
|
||||
libtune2fs \
|
||||
$(tune2fs_static_libraries)
|
||||
|
||||
LOCAL_HEADER_LIBRARIES := libgtest_prod_headers
|
||||
|
||||
LOCAL_MODULE_CLASS := EXECUTABLES
|
||||
inc := $(call local-generated-sources-dir)/register.inc
|
||||
|
||||
# Devices can also add libraries to TARGET_RECOVERY_UPDATER_EXTRA_LIBS.
|
||||
# These libs are also linked in with updater, but we don't try to call
|
||||
# any sort of registration function for these. Use this variable for
|
||||
# any subsidiary static libraries required for your registered
|
||||
# extension libs.
|
||||
$(inc) : libs := $(TARGET_RECOVERY_UPDATER_LIBS)
|
||||
$(inc) :
|
||||
$(call generate-register-inc,$@,$(libs))
|
||||
|
||||
LOCAL_GENERATED_SOURCES := $(inc)
|
||||
|
||||
inc :=
|
||||
|
||||
LOCAL_FORCE_STATIC_EXECUTABLE := true
|
||||
|
||||
include $(BUILD_EXECUTABLE)
|
||||
Loading…
Reference in a new issue