diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-11-27 00:59:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-11-27 00:59:19 +0000 |
| commit | ee9d6382d13411614c27b25de8c97273f066a8d3 (patch) | |
| tree | 4e70073db4345fd69bd44554bff6b9c4ad92809a | |
| parent | 66a6d8877cdaf169a24e0e7157f50b551a7b70a2 (diff) | |
| parent | 3f439a7a887736cb3cf26d6523defc19ff61ec7b (diff) | |
| download | system_core-ee9d6382d13411614c27b25de8c97273f066a8d3.tar.gz system_core-ee9d6382d13411614c27b25de8c97273f066a8d3.tar.bz2 system_core-ee9d6382d13411614c27b25de8c97273f066a8d3.zip | |
Merge "Switch from dist-for-goals to dist in Android.bp"
| -rw-r--r-- | adb/Android.bp | 9 | ||||
| -rw-r--r-- | adb/Android.mk | 8 | ||||
| -rw-r--r-- | cpio/Android.bp | 3 | ||||
| -rw-r--r-- | cpio/Android.mk | 3 | ||||
| -rw-r--r-- | fastboot/Android.bp | 7 | ||||
| -rw-r--r-- | fastboot/Android.mk | 6 |
6 files changed, 20 insertions, 16 deletions
diff --git a/adb/Android.bp b/adb/Android.bp index 00e98feeb..e994075d9 100644 --- a/adb/Android.bp +++ b/adb/Android.bp @@ -285,6 +285,15 @@ cc_binary_host { "deploypatchgenerator", ], + // Archive adb, adb.exe. + dist: { + targets: [ + "dist_files", + "sdk", + "win_sdk", + ], + }, + target: { darwin: { cflags: [ diff --git a/adb/Android.mk b/adb/Android.mk deleted file mode 100644 index 8b2d5582d..000000000 --- a/adb/Android.mk +++ /dev/null @@ -1,8 +0,0 @@ -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 diff --git a/cpio/Android.bp b/cpio/Android.bp index 847e0f1b9..baa031907 100644 --- a/cpio/Android.bp +++ b/cpio/Android.bp @@ -5,4 +5,7 @@ cc_binary_host { srcs: ["mkbootfs.c"], cflags: ["-Werror"], shared_libs: ["libcutils"], + dist: { + targets: ["dist_files"], + }, } diff --git a/cpio/Android.mk b/cpio/Android.mk deleted file mode 100644 index fc3551b98..000000000 --- a/cpio/Android.mk +++ /dev/null @@ -1,3 +0,0 @@ -# Copyright 2005 The Android Open Source Project - -$(call dist-for-goals,dist_files,$(ALL_MODULES.mkbootfs.BUILT)) diff --git a/fastboot/Android.bp b/fastboot/Android.bp index faed376ab..8006c41f9 100644 --- a/fastboot/Android.bp +++ b/fastboot/Android.bp @@ -260,6 +260,13 @@ cc_binary_host { "mke2fs", "make_f2fs", ], + dist: { + targets: [ + "dist_files", + "sdk", + "win_sdk", + ], + }, target: { not_windows: { diff --git a/fastboot/Android.mk b/fastboot/Android.mk index e4c13175c..17ec392fd 100644 --- a/fastboot/Android.mk +++ b/fastboot/Android.mk @@ -18,13 +18,9 @@ LOCAL_PATH:= $(call my-dir) # Package fastboot-related executables. # -my_dist_files := $(HOST_OUT_EXECUTABLES)/fastboot -my_dist_files += $(HOST_OUT_EXECUTABLES)/mke2fs +my_dist_files := $(HOST_OUT_EXECUTABLES)/mke2fs my_dist_files += $(HOST_OUT_EXECUTABLES)/e2fsdroid my_dist_files += $(HOST_OUT_EXECUTABLES)/make_f2fs my_dist_files += $(HOST_OUT_EXECUTABLES)/sload_f2fs $(call dist-for-goals,dist_files sdk win_sdk,$(my_dist_files)) -ifdef HOST_CROSS_OS -$(call dist-for-goals,dist_files sdk win_sdk,$(ALL_MODULES.host_cross_fastboot.BUILT)) -endif my_dist_files := |