From 5d6726b88edeac0da96e7eefe96db36109a540ce Mon Sep 17 00:00:00 2001 From: Herbert Xue Date: Fri, 10 Nov 2023 10:38:52 +0800 Subject: [PATCH] Remove unused Android.mk under device/google/gs101 The license declaration can't be handled in Android.bp currently. So keep them in Android.bp. Bug: 310058310 Test: NA Change-Id: I3e25fa07f6b3e1bffaf585d69e342c651b50f6ef --- Android.mk | 9 --------- vibrator/Android.mk | 17 ----------------- 2 files changed, 26 deletions(-) delete mode 100644 vibrator/Android.mk diff --git a/Android.mk b/Android.mk index de54c3a4..0a022e9c 100644 --- a/Android.mk +++ b/Android.mk @@ -20,8 +20,6 @@ # to only building on ARM if they include assembly. Individual makefiles # are responsible for having their own logic, for fine-grained control. -LOCAL_PATH := $(call my-dir) - $(eval $(call declare-copy-files-license-metadata,device/google/gs101,default-permissions.xml,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) $(eval $(call declare-copy-files-license-metadata,device/google/gs101,libnfc-nci.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) $(eval $(call declare-copy-files-license-metadata,device/google/gs101,fstab.postinstall,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) @@ -37,10 +35,3 @@ $(eval $(call declare-copy-files-license-metadata,device/google/gs101,wpa_suppli $(eval $(call declare-copy-files-license-metadata,device/google/gs101,wpa_supplicant_overlay.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) $(eval $(call declare-1p-copy-files,device/google/gs101,audio_policy_configuration.xml)) - -# if some modules are built directly from this directory (not subdirectories), -# their rules should be written here. - -ifeq ($(USES_DEVICE_GOOGLE_GS101),true) - include $(call first-makefiles-under,$(LOCAL_PATH)) -endif diff --git a/vibrator/Android.mk b/vibrator/Android.mk deleted file mode 100644 index 5b089be2..00000000 --- a/vibrator/Android.mk +++ /dev/null @@ -1,17 +0,0 @@ -# -# Copyright (C) 2020 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 $(call first-makefiles-under, $(call my-dir))