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

Commit 058cb936 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Convert Android.mk file to Android.bp"

parents 2470dd34 6a6bdada

cmds/dumpstate/Android.bp

+19 −0
Original line number Diff line number Diff line
@@ -157,3 +157,22 @@ cc_test { 
    ],

    static_libs: ["libgmock"],

}





// =======================#

// dumpstate_test_fixture #

// =======================#

cc_test {



    name: "dumpstate_test_fixture",

    test_suites: ["device-tests"],

    cflags: [

        "-Wall",

        "-Werror",

        "-Wno-missing-field-initializers",

        "-Wno-unused-variable",

        "-Wunused-parameter",

    ],

    srcs: ["tests/dumpstate_test_fixture.cpp"],

    data: ["tests/testdata/**/*"],

}

cmds/dumpstate/Android.mk

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)



# =======================#

# dumpstate_test_fixture #

# =======================#

include $(CLEAR_VARS)



LOCAL_MODULE := dumpstate_test_fixture

LOCAL_COMPATIBILITY_SUITE := device-tests

LOCAL_MODULE_TAGS := tests



LOCAL_CFLAGS := \

       -Wall -Werror -Wno-missing-field-initializers -Wno-unused-variable -Wunused-parameter



LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk



LOCAL_SRC_FILES := \

        tests/dumpstate_test_fixture.cpp



LOCAL_TEST_DATA := $(call find-test-data-in-subdirs, $(LOCAL_PATH), *, tests/testdata)



include $(BUILD_NATIVE_TEST)

cmds/installd/Android.bp

+20 −0
Original line number Diff line number Diff line
@@ -227,3 +227,23 @@ cc_binary { 
        "libutils",

    ],

}



// OTA slot script

cc_prebuilt_binary {

    name: "otapreopt_slot",

    srcs: ["otapreopt_slot.sh"],

    init_rc: ["otapreopt.rc"],

}



// OTA postinstall script

cc_prebuilt_binary {

    name: "otapreopt_script",

    srcs: ["otapreopt_script.sh"],

    // Let this depend on otapreopt, the chroot tool and the slot script,

    // so we just have to mention one in a configuration.

    required: [

        "otapreopt",

        "otapreopt_chroot",

        "otapreopt_slot",

    ],

}

cmds/installd/Android.mk

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
LOCAL_PATH := $(call my-dir)



# OTA slot script



include $(CLEAR_VARS)

LOCAL_MODULE:= otapreopt_slot

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_CLASS := EXECUTABLES

LOCAL_SRC_FILES := otapreopt_slot.sh

LOCAL_INIT_RC := otapreopt.rc



include $(BUILD_PREBUILT)



# OTA postinstall script



include $(CLEAR_VARS)

LOCAL_MODULE:= otapreopt_script

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_CLASS := EXECUTABLES

LOCAL_SRC_FILES := otapreopt_script.sh



# Let this depend on otapreopt, the chroot tool and the slot script, so we just have to mention one

# in a configuration.

LOCAL_REQUIRED_MODULES := otapreopt otapreopt_chroot otapreopt_slot



include $(BUILD_PREBUILT)

opengl/libs/Android.mk

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)