diff options
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-11-17 03:30:24 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-17 03:30:24 +0000 |
commit | 4f9c0920e553f39fe7d209d323f1a75eb82ca6d1 (patch) | |
tree | 275d6e3aaf06731fb11c55e02e572f624611d618 | |
parent | 44a1cb332cf00e9e68918ecda61c4ced6c190846 (diff) | |
parent | c67c23d7efe19aa40b550dde4399f3a6ebfb3ce7 (diff) | |
download | sunfish-4f9c0920e553f39fe7d209d323f1a75eb82ca6d1.tar.gz |
Merge "Remove unused Android.mk under device/google/sunfish" into main am: c67c23d7eftmp_amf_315507370
Original change: https://android-review.googlesource.com/c/device/google/sunfish/+/2824754
Change-Id: I405116d274cfcba81fa0be1aa330b13bd1bef64d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.mk | 38 | ||||
-rw-r--r-- | dumpstate/Android.mk | 44 | ||||
-rw-r--r-- | json-c/Android.mk | 38 | ||||
-rw-r--r-- | self-extractors/Android.mk | 0 | ||||
-rw-r--r-- | self-extractors/google_devices/staging/Android.mk | 26 | ||||
-rw-r--r-- | self-extractors/qcom/staging/Android.mk | 68 |
6 files changed, 0 insertions, 214 deletions
diff --git a/Android.mk b/Android.mk deleted file mode 100644 index b3884609..00000000 --- a/Android.mk +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright 2019 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) - -$(eval $(call declare-copy-files-license-metadata,device/google/sunfish,default-permissions.xml,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) -$(eval $(call declare-copy-files-license-metadata,device/google/sunfish,libnfc-nci.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) -$(eval $(call declare-copy-files-license-metadata,device/google/sunfish,fstab.postinstall,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) -$(eval $(call declare-copy-files-license-metadata,device/google/sunfish,ueventd.rc,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) -$(eval $(call declare-copy-files-license-metadata,device/google/sunfish,wpa_supplicant.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) -$(eval $(call declare-copy-files-license-metadata,device/google/sunfish,hals.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) -$(eval $(call declare-copy-files-license-metadata,device/google/sunfish,media_profiles_V1_0.xml,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) -$(eval $(call declare-copy-files-license-metadata,device/google/sunfish,media_codecs_performance.xml,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) -$(eval $(call declare-copy-files-license-metadata,device/google/sunfish,device_state_configuration.xml,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) -$(eval $(call declare-copy-files-license-metadata,device/google/sunfish,task_profiles.json,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) -$(eval $(call declare-copy-files-license-metadata,device/google/sunfish,p2p_supplicant.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) -$(eval $(call declare-copy-files-license-metadata,device/google/sunfish,wpa_supplicant.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) -$(eval $(call declare-copy-files-license-metadata,device/google/sunfish,wpa_supplicant_overlay.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) - -$(eval $(call declare-1p-copy-files,device/google/sunfish,audio_policy_configuration.xml)) - -ifeq ($(USES_DEVICE_GOOGLE_SUNFISH),true) - subdir_makefiles=$(call first-makefiles-under,$(LOCAL_PATH)) - $(foreach mk,$(subdir_makefiles),$(info including $(mk) ...)$(eval include $(mk))) -endif diff --git a/dumpstate/Android.mk b/dumpstate/Android.mk deleted file mode 100644 index 8771d26f..00000000 --- a/dumpstate/Android.mk +++ /dev/null @@ -1,44 +0,0 @@ -# -# Copyright 2016 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) -include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.dumpstate@1.1-service.sunfish -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_INIT_RC := android.hardware.dumpstate@1.1-service.sunfish.rc -LOCAL_MODULE_RELATIVE_PATH := hw - -LOCAL_SRC_FILES := \ - DumpstateDevice.cpp \ - service.cpp - -LOCAL_SHARED_LIBRARIES := \ - android.hardware.dumpstate@1.0 \ - android.hardware.dumpstate@1.1 \ - libbase \ - libcutils \ - libdumpstateutil \ - libhidlbase \ - liblog \ - libutils - -LOCAL_CFLAGS := -Werror -Wall - -LOCAL_MODULE_TAGS := optional -LOCAL_PROPRIETARY_MODULE := true - -include $(BUILD_EXECUTABLE) diff --git a/json-c/Android.mk b/json-c/Android.mk deleted file mode 100644 index 8a1eae11..00000000 --- a/json-c/Android.mk +++ /dev/null @@ -1,38 +0,0 @@ -LIBJSON_ROOT := $(call my-dir) -include $(CLEAR_VARS) -LOCAL_MODULE := libjson -LOCAL_LICENSE_KINDS := legacy_notice -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_PATH := $(LIBJSON_ROOT) -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/COPYING -LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include -LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr -LOCAL_COPY_HEADERS_TO := libjson/inc -LOCAL_COPY_HEADERS := bits.h \ - config.h \ - debug.h \ - linkhash.h \ - arraylist.h \ - json.h \ - json_config.h \ - json_inttypes.h \ - json_util.h \ - json_object.h \ - json_tokener.h \ - json_object_iterator.h \ - json_c_version.h -LOCAL_SRC_FILES := arraylist.c \ - debug.c \ - json_c_version.c \ - json_object.c \ - json_object_iterator.c \ - json_tokener.c \ - json_util.c \ - libjson.c \ - linkhash.c \ - printbuf.c \ - random_seed.c -LOCAL_SHARED_LIBRARIES := libcutils libutils -LOCAL_MODULE_TAG := optional -LOCAL_VENDOR_MODULE := true -include $(BUILD_SHARED_LIBRARY) diff --git a/self-extractors/Android.mk b/self-extractors/Android.mk deleted file mode 100644 index e69de29b..00000000 --- a/self-extractors/Android.mk +++ /dev/null diff --git a/self-extractors/google_devices/staging/Android.mk b/self-extractors/google_devices/staging/Android.mk deleted file mode 100644 index d47a4ff4..00000000 --- a/self-extractors/google_devices/staging/Android.mk +++ /dev/null @@ -1,26 +0,0 @@ -# -# Copyright (C) 2019 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) - -$(call declare-license-metadata,$(LOCAL_PATH)/vendor.img,legacy_proprietary,proprietary,$(LOCAL_PATH)/../LICENSE,"Vendor Image",vendor) - -ifneq ($(filter sunfish,$(TARGET_DEVICE)),) - $(call add-radio-file,bootloader.img) - $(call declare-license-metadata,$(LOCAL_PATH)/bootloader.img,legacy_proprietary,proprietary,$(LOCAL_PATH)/../LICENSE,"Vendor Bootloader Image",vendor) - $(call add-radio-file,radio.img) - $(call declare-license-metadata,$(LOCAL_PATH)/radio.img,legacy_proprietary,proprietary,$(LOCAL_PATH)/../LICENSE,"Vendor Radio Image",vendor) -endif diff --git a/self-extractors/qcom/staging/Android.mk b/self-extractors/qcom/staging/Android.mk deleted file mode 100644 index eda582fd..00000000 --- a/self-extractors/qcom/staging/Android.mk +++ /dev/null @@ -1,68 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -$(call declare-license-metadata,$(LOCAL_PATH)/vendor.img,legacy_proprietary,proprietary,$(LOCAL_PATH)/../LICENSE,"Vendor Image",vendor) - -$(eval $(call declare-copy-files-license-metadata,vendor/qcom/sunfish,:qcom,legacy_proprietary,proprietary,vendor/qcom/sunfish/LICENSE,)) -$(eval $(call declare-copy-files-license-metadata,vendor/qcom/sunfish,.jar,legacy_proprietary,proprietary,vendor/qcom/sunfish/LICENSE,)) -$(eval $(call declare-copy-files-license-metadata,vendor/qcom/sunfish,.xml,legacy_proprietary,proprietary,vendor/qcom/sunfish/LICENSE,)) - -ifneq ($(filter sunfish, $(TARGET_DEVICE)),) -include $(CLEAR_VARS) -LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX) -LOCAL_MODULE := ims -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE -LOCAL_MODULE_TAGS := optional -LOCAL_BUILT_MODULE_STEM := package.apk -LOCAL_SYSTEM_EXT_MODULE := true -LOCAL_PRIVILEGED_MODULE := true -LOCAL_MODULE_OWNER := qcom -LOCAL_MODULE_CLASS := APPS -LOCAL_SRC_FILES := $(LOCAL_MODULE).apk -LOCAL_CERTIFICATE := platform -# Disable dexpreopt and <uses-library> check because the APK depends on -# libraries that are not present as modules in the build system. -LOCAL_ENFORCE_USES_LIBRARIES := false -LOCAL_DEX_PREOPT := false -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX) -LOCAL_MODULE := qcrilmsgtunnel -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE -LOCAL_MODULE_TAGS := optional -LOCAL_BUILT_MODULE_STEM := package.apk -LOCAL_SYSTEM_EXT_MODULE := true -LOCAL_PRIVILEGED_MODULE := true -LOCAL_MODULE_OWNER := qcom -LOCAL_MODULE_CLASS := APPS -LOCAL_SRC_FILES := $(LOCAL_MODULE).apk -LOCAL_CERTIFICATE := platform -# Disable dexpreopt and <uses-library> check because the APK depends on -# libraries that are not present as modules in the build system. -LOCAL_ENFORCE_USES_LIBRARIES := false -LOCAL_DEX_PREOPT := false -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX) -LOCAL_MODULE := QtiTelephonyService -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE -LOCAL_MODULE_TAGS := optional -LOCAL_BUILT_MODULE_STEM := package.apk -LOCAL_SYSTEM_EXT_MODULE := true -LOCAL_MODULE_OWNER := qcom -LOCAL_MODULE_CLASS := APPS -LOCAL_SRC_FILES := $(LOCAL_MODULE).apk -LOCAL_CERTIFICATE := platform -# Disable dexpreopt and <uses-library> check because the APK depends on -# libraries that are not present as modules in the build system. -LOCAL_ENFORCE_USES_LIBRARIES := false -LOCAL_DEX_PREOPT := false -include $(BUILD_PREBUILT) -endif |