Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30dcecc1 authored by Tao Bao's avatar Tao Bao Committed by android-build-merger
Browse files

Merge "Add dummy vndk library libmkbootimg to enable abi checks on boot_img_hdr." 

am: b7ba61ff

Change-Id: I1d8bc6b6a7854af694c9eb642953c40d7521a2d0
parents 3504d5a5 b7ba61ff

fastboot/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@ LOCAL_CFLAGS += -DFASTBOOT_VERSION="\"$(tool_version)\"" 


LOCAL_C_INCLUDES := \

  $(LOCAL_PATH)/../adb \

  $(LOCAL_PATH)/../mkbootimg \



LOCAL_HEADER_LIBRARIES := bootimg_headers



LOCAL_SRC_FILES := \

    bootimg_utils.cpp \

init/Android.bp

+1 −3
Original line number Diff line number Diff line
@@ -127,9 +127,7 @@ cc_library_static { 
        "watchdogd.cpp",

    ],

    whole_static_libs: ["libcap"],

    include_dirs: [

        "system/core/mkbootimg",

    ],

    header_libs: ["bootimg_headers"],

    proto: {

        type: "lite",

        export_proto_headers: true,

mkbootimg/Android.bp

0 → 100644
+32 −0
Original line number Diff line number Diff line 
// Copyright 2012 The Android Open Source Project



cc_library_headers {

    name: "libmkbootimg_abi_headers",

    vendor_available: true,

    export_include_dirs: ["include"],

}



cc_library_headers {

    name: "bootimg_headers",

    vendor_available: true,

    export_include_dirs: ["include/bootimg"],

    host_supported: true,

    target: {

        windows: {

            enabled: true,

        },

    },

}



cc_library {

    name: "libmkbootimg_abi_check",

    vendor_available: true,

    vndk: {

        enabled: true,

    },

    srcs: [

        "mkbootimg_dummy.cpp",

    ],

    header_libs: ["libmkbootimg_abi_headers"],

    export_header_lib_headers: ["libmkbootimg_abi_headers"],

}

mkbootimg/include/abi_check/mkbootimg_abi_check.h

0 → 100644
+28 −0
Original line number Diff line number Diff line 
/*

 * 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.

 */



#include <bootimg/bootimg.h>



// This header has been created for the following reaons:

//    1) In order for a change in a user defined type to be classified as API /

//       ABI breaking, it needs to be referenced by an 'exported interface'

//       (in this case the function mkbootimg_dummy).

//    2) Since 'mkbootimg_dummy' needs to be exported, we need to have it

//       exposed through a public header.

//    3) It is desirable not to pollute bootimg.h with interfaces which are not

//       'used' in reality by on device binaries. Furthermore, bootimg.h might

//       be exported by a library in the future, so we must avoid polluting it.

void mkbootimg_dummy(boot_img_hdr*);

mkbootimg/bootimg.h→mkbootimg/include/bootimg/bootimg.h

+14 −14

File changed and moved.

Contains only whitespace changes.