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

Commit fff8d6b2 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Switch from dist-for-goals to dist in Android.bp" am: ee9d6382 

am: 672cbe75

Change-Id: Iaec917a412dd2342979d00326d194854d9384990
parents d3e8fcf4 672cbe75

adb/Android.bp

+9 −0
Original line number Diff line number Diff line
@@ -285,6 +285,15 @@ cc_binary_host { 
        "deploypatchgenerator",

    ],



    // Archive adb, adb.exe.

    dist: {

        targets: [

            "dist_files",

            "sdk",

            "win_sdk",

        ],

    },



    target: {

        darwin: {

            cflags: [

adb/Android.mk

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



# Archive adb, adb.exe.

$(call dist-for-goals,dist_files sdk win_sdk,$(HOST_OUT_EXECUTABLES)/adb)



ifdef HOST_CROSS_OS

$(call dist-for-goals,dist_files sdk win_sdk,$(ALL_MODULES.host_cross_adb.BUILT))

endif

cpio/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -5,4 +5,7 @@ cc_binary_host { 
    srcs: ["mkbootfs.c"],

    cflags: ["-Werror"],

    shared_libs: ["libcutils"],

    dist: {

        targets: ["dist_files"],

    },

}

cpio/Android.mk

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line 
# Copyright 2005 The Android Open Source Project



$(call dist-for-goals,dist_files,$(ALL_MODULES.mkbootfs.BUILT))

fastboot/Android.bp

+7 −0
Original line number Diff line number Diff line
@@ -260,6 +260,13 @@ cc_binary_host { 
        "mke2fs",

        "make_f2fs",

    ],

    dist: {

        targets: [

            "dist_files",

            "sdk",

            "win_sdk",

        ],

    },



    target: {

        not_windows: {