8ed9738b62
When using AVB, PRODUCT_SUPPORTS_VERITY is not set so check for BOARD_ENABLE_AVB as well. Also AVB sets up the root filesystem as 'vroot' so map that to 'system' since this is what is expected. Managed to test at least that the code is at least compiled in: $ fastboot --set-active=_a Setting current slot to 'a'... OKAY [ 0.023s] finished. total time: 0.023s $ fastboot reboot rebooting... finished. total time: 0.050s $ adb wait-for-device $ adb logcat |grep update_verifier 03-04 05:28:56.773 630 630 I /system/bin/update_verifier: Started with arg 1: nonencrypted 03-04 05:28:56.776 630 630 I /system/bin/update_verifier: Booting slot 0: isSlotMarkedSuccessful=0 03-04 05:28:56.776 630 630 W /system/bin/update_verifier: Failed to open /data/ota_package/care_map.txt: No such file or directory 03-04 05:28:56.788 630 630 I /system/bin/update_verifier: Marked slot 0 as booted successfully. 03-04 05:28:56.788 630 630 I /system/bin/update_verifier: Leaving update_verifier. Bug: None Test: Manually tested on device using AVB bootloader. Change-Id: I13c0fe1cc5d0f397e36f5e62fcc05c8dfee5fd85
71 lines
1.7 KiB
Makefile
71 lines
1.7 KiB
Makefile
# Copyright (C) 2015 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)
|
|
|
|
# libupdate_verifier (static library)
|
|
# ===============================
|
|
include $(CLEAR_VARS)
|
|
|
|
LOCAL_SRC_FILES := \
|
|
update_verifier.cpp
|
|
|
|
LOCAL_MODULE := libupdate_verifier
|
|
LOCAL_SHARED_LIBRARIES := \
|
|
libbase \
|
|
libcutils \
|
|
android.hardware.boot@1.0
|
|
|
|
LOCAL_CFLAGS := -Wall -Werror
|
|
|
|
LOCAL_EXPORT_C_INCLUDE_DIRS := \
|
|
$(LOCAL_PATH)/include
|
|
|
|
LOCAL_C_INCLUDES := \
|
|
$(LOCAL_PATH)/include
|
|
|
|
ifeq ($(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VERITY),true)
|
|
LOCAL_CFLAGS += -DPRODUCT_SUPPORTS_VERITY=1
|
|
endif
|
|
|
|
ifeq ($(BOARD_AVB_ENABLE),true)
|
|
LOCAL_CFLAGS += -DBOARD_AVB_ENABLE=1
|
|
endif
|
|
|
|
include $(BUILD_STATIC_LIBRARY)
|
|
|
|
# update_verifier (executable)
|
|
# ===============================
|
|
include $(CLEAR_VARS)
|
|
|
|
LOCAL_SRC_FILES := \
|
|
update_verifier_main.cpp
|
|
|
|
LOCAL_MODULE := update_verifier
|
|
LOCAL_STATIC_LIBRARIES := \
|
|
libupdate_verifier
|
|
LOCAL_SHARED_LIBRARIES := \
|
|
libbase \
|
|
libcutils \
|
|
libhardware \
|
|
liblog \
|
|
libutils \
|
|
libhidlbase \
|
|
android.hardware.boot@1.0
|
|
|
|
LOCAL_CFLAGS := -Wall -Werror
|
|
|
|
LOCAL_INIT_RC := update_verifier.rc
|
|
|
|
include $(BUILD_EXECUTABLE)
|