PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Snap for 4949134 from eee4b3a61b to qt-release

Browse Source 
Change-Id: I96e96a56894f90a58f76ccf2155831b77962310d
This commit is contained in:
android-build-team Robot
2018-08-12 03:02:54 +00:00
parent 14a52ccf1b eee4b3a61b
commit 08ab2407ab
12 changed files with 168 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Android.bp
+13 -1
View File
@@ -16,6 +16,11 @@ 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",
],
@@ -24,6 +29,7 @@ cc_defaults {
// Generic device that uses ScreenRecoveryUI.
cc_library_static {
name: "librecovery_ui_default",
recovery_available: true,
defaults: [
"recovery_defaults",
@@ -37,6 +43,7 @@ cc_library_static {
// The default wear device that uses WearRecoveryUI.
cc_library_static {
name: "librecovery_ui_wear",
recovery_available: true,
defaults: [
"recovery_defaults",
@@ -50,6 +57,7 @@ cc_library_static {
// The default VR device that uses VrRecoveryUI.
cc_library_static {
name: "librecovery_ui_vr",
recovery_available: true,
defaults: [
"recovery_defaults",
@@ -62,6 +70,7 @@ cc_library_static {
cc_library_static {
name: "libverifier",
recovery_available: true,
defaults: [
"recovery_defaults",
@@ -72,10 +81,13 @@ cc_library_static {
"verifier.cpp",
],
static_libs: [
shared_libs: [
"libbase",
"libcrypto",
"libcrypto_utils",
],
static_libs: [
"libotautil",
],
}
Android.mk
+32 -15
View File
@@ -125,31 +125,32 @@ health_hal_static_libraries := \
libbatterymonitor
librecovery_static_libraries := \
libbootloader_message \
libfusesideload \
libminadbd \
libminui \
libverifier \
libotautil \
$(health_hal_static_libraries) \
libasyncio \
libcrypto_utils \
libcrypto \
libext4_utils \
libfs_mgr \
libpng \
libsparse \
libvintf_recovery \
libvintf \
libhidl-gen-utils \
libtinyxml2 \
libziparchive \
librecovery_shared_libraries := \
libasyncio \
libbase \
libutils \
libbootloader_message \
libcrypto \
libcrypto_utils \
libcutils \
libext4_utils \
libfs_mgr \
libhidl-gen-utils \
liblog \
libpng \
libselinux \
libtinyxml2 \
libutils \
libz \
libziparchive \
# librecovery (static library)
# ===============================
@@ -173,6 +174,9 @@ LOCAL_MODULE := librecovery
LOCAL_STATIC_LIBRARIES := \
$(librecovery_static_libraries)
LOCAL_SHARED_LIBRARIES := \
$(librecovery_shared_libraries)
include $(BUILD_STATIC_LIBRARY)
# recovery (static executable)
@@ -200,6 +204,7 @@ LOCAL_STATIC_LIBRARIES := \
LOCAL_SHARED_LIBRARIES := \
librecovery_ui \
$(librecovery_shared_libraries)
LOCAL_HAL_STATIC_LIBRARIES := libhealthd
@@ -219,7 +224,8 @@ endif
# e2fsck is needed for adb remount -R.
ifeq ($(BOARD_EXT4_SHARE_DUP_BLOCKS),true)
ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
LOCAL_REQUIRED_MODULES += e2fsck_static
LOCAL_REQUIRED_MODULES += \
e2fsck_static
endif
endif
@@ -235,15 +241,26 @@ LOCAL_REQUIRED_MODULES += \
# TODO(b/110380063): Explicitly install the following shared libraries to recovery, until `recovery`
# module is built with Soong (with `recovery: true` flag).
LOCAL_REQUIRED_MODULES += \
libasyncio.recovery \
libbase.recovery \
libbootloader_message.recovery \
libcrypto.recovery \
libcrypto_utils.recovery \
libcutils.recovery \
libext4_utils.recovery \
libfs_mgr.recovery \
libhidl-gen-utils.recovery \
liblog.recovery \
libpng.recovery \
libselinux.recovery \
libsparse.recovery \
libtinyxml2.recovery \
libutils.recovery \
libz.recovery \
libziparchive.recovery \
include $(BUILD_EXECUTABLE)
include \
$(LOCAL_PATH)/boot_control/Android.mk \
$(LOCAL_PATH)/tests/Android.mk \
$(LOCAL_PATH)/updater/Android.mk \
$(LOCAL_PATH)/updater_sample/Android.mk \
boot_control/Android.bp
+37
View File
@@ -0,0 +1,37 @@
//
// 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_library_shared {
name: "bootctrl.default",
recovery_available: true,
relative_install_path: "hw",
srcs: ["boot_control.cpp"],
cflags: [
"-D_FILE_OFFSET_BITS=64",
"-Werror",
"-Wall",
"-Wextra",
],
shared_libs: [
"libbase",
"libbootloader_message",
"libfs_mgr",
"liblog",
],
}
boot_control/Android.mk
-33
View File
@@ -1,33 +0,0 @@
#
# 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.
#
LOCAL_PATH := $(my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := bootctrl.bcb
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_SRC_FILES := boot_control.cpp
LOCAL_CFLAGS := \
-D_FILE_OFFSET_BITS=64 \
-Werror \
-Wall \
-Wextra
LOCAL_SHARED_LIBRARIES := liblog
LOCAL_STATIC_LIBRARIES := libbootloader_message libfs_mgr libbase
LOCAL_POST_INSTALL_CMD := \
$(hide) mkdir -p $(TARGET_OUT_SHARED_LIBRARIES)/hw && \
ln -sf bootctrl.bcb.so $(TARGET_OUT_SHARED_LIBRARIES)/hw/bootctrl.default.so
include $(BUILD_SHARED_LIBRARY)
fuse_sideload/Android.bp
+1 -1
View File
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
cc_library_static {
cc_library {
name: "libfusesideload",
cflags: [
minui/Android.bp
+1
View File
@@ -14,6 +14,7 @@
cc_library {
name: "libminui",
recovery_available: true,
defaults: [
"recovery_defaults",
otautil/Android.bp
+8 -9
View File
@@ -16,6 +16,11 @@ cc_library_static {
name: "libotautil",
host_supported: true,
recovery_available: true,
defaults: [
"recovery_defaults",
],
// Minimal set of files to support host build.
srcs: [
@@ -23,16 +28,10 @@ cc_library_static {
"rangeset.cpp",
],
static_libs: [
shared_libs: [
"libbase",
],
cflags: [
"-D_FILE_OFFSET_BITS=64",
"-Werror",
"-Wall",
],
export_include_dirs: [
"include",
],
@@ -46,9 +45,9 @@ cc_library_static {
"thermalutil.cpp",
],
static_libs: [
"libselinux",
shared_libs: [
"libcutils",
"libselinux",
],
},
},
updater_sample/Android.bp
+35
View File
@@ -0,0 +1,35 @@
// 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.
android_app {
name: "SystemUpdaterSample",
sdk_version: "system_current",
privileged: true,
srcs: ["src/**/*.java"],
static_libs: [
"guava",
],
optimize: {
// TODO(b/112462307): proguard_flags_files is not picked up by Soong.
// proguard_flags_files: [
// "proguard.flags",
// ],
enabled: false,
},
resource_dirs: ["res"],
}
updater_sample/Android.mk
-35
View File
@@ -1,35 +0,0 @@
#
# 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.
#
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_PACKAGE_NAME := SystemUpdaterSample
LOCAL_SDK_VERSION := system_current
LOCAL_PRIVILEGED_MODULE := true
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_STATIC_JAVA_LIBRARIES += guava
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
include $(BUILD_PACKAGE)
# Use the following include to make our test apk.
include $(call all-makefiles-under,$(LOCAL_PATH))
updater_sample/README.md
+1 -1
View File
@@ -227,7 +227,7 @@ privileged system app, so it's granted the required permissions to access
1. Build `mmma bootable/recovery/updater_sample/`
2. Install app
`adb install $OUT/system/app/SystemUpdaterSample/SystemUpdaterSample.apk`
`adb install $OUT/system/priv-app/SystemUpdaterSample/SystemUpdaterSample.apk`
3. Install tests
`adb install $OUT/testcases/SystemUpdaterSampleTests/SystemUpdaterSampleTests.apk`
4. Run tests
updater_sample/tests/Android.bp
+40
View File
@@ -0,0 +1,40 @@
// 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.
android_test {
name: "SystemUpdaterSampleTests",
sdk_version: "system_current",
libs: [
"android.test.base.stubs",
"android.test.runner.stubs",
"SystemUpdaterSample",
],
static_libs: [
"android-support-test",
"mockito-target-minus-junit4",
"guava",
],
instrumentation_for: "com.example.android.systemupdatersample",
optimize: {
enabled: false,
},
resource_dirs: ["res"],
srcs: ["src/**/*.java"],
}
updater_sample/tests/Android.mk
-36
View File
@@ -1,36 +0,0 @@
#
# 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.
#
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_PACKAGE_NAME := SystemUpdaterSampleTests
LOCAL_SDK_VERSION := system_current
LOCAL_MODULE_TAGS := tests
LOCAL_JAVA_LIBRARIES := \
android.test.base.stubs \
android.test.runner.stubs
LOCAL_STATIC_JAVA_LIBRARIES := android-support-test \
mockito-target-minus-junit4 \
guava
LOCAL_INSTRUMENTATION_FOR := SystemUpdaterSample
LOCAL_PROGUARD_ENABLED := disabled
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_SRC_FILES := $(call all-java-files-under, src)
include $(BUILD_PACKAGE)