diff options
| author | Herbert Xue <herbertxue@google.com> | 2023-11-21 02:43:50 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-21 02:43:50 +0000 |
| commit | 1ac9cb790faf30e562f112a49224bf28e2eabd59 (patch) | |
| tree | 5d9a14ce7121ec646388037cc826a6ccfe36579f | |
| parent | 5270c3784b2f574a5999ea69ec1b091c204b5385 (diff) | |
| parent | 09d48f9094f3afee744f87bc07eb5eda100ba161 (diff) | |
| download | lynx-1ac9cb790faf30e562f112a49224bf28e2eabd59.tar.gz | |
[conflict] Remove unused Android.mk under device/google/lynx am: eaadd11df8 am: 09d48f9094
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/25422223
Change-Id: I2acfa557ec69a11d521ea5c972276e85c83d5817
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.mk | 30 | ||||
| -rw-r--r-- | self-extractors/Android.mk | 0 | ||||
| -rw-r--r-- | self-extractors/google_devices/staging/Android.mk.template (renamed from self-extractors/google_devices/staging/Android.mk) | 2 |
3 files changed, 1 insertions, 31 deletions
diff --git a/Android.mk b/Android.mk deleted file mode 100644 index fc7b4f7..0000000 --- a/Android.mk +++ /dev/null @@ -1,30 +0,0 @@ -# -# Copyright (C) 2021 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. -# - -# WARNING: Everything listed here will be built on ALL platforms, -# including x86, the universal, and the SDK. Modules must be uniquely -# named (liblights.panda), and must build everywhere, or limit themselves -# 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) - -# if some modules are built directly from this directory (not subdirectories), -# their rules should be written here. - -ifneq (,$(filter $(TARGET_DEVICE),lynx)) - include $(call all-makefiles-under,$(LOCAL_PATH)) -endif diff --git a/self-extractors/Android.mk b/self-extractors/Android.mk deleted file mode 100644 index e69de29..0000000 --- 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.template index 92948df..a720400 100644 --- a/self-extractors/google_devices/staging/Android.mk +++ b/self-extractors/google_devices/staging/Android.mk.template @@ -48,7 +48,7 @@ LOCAL_PRIVILEGED_MODULE := true LOCAL_MODULE_OWNER := samsung LOCAL_MODULE_CLASS := APPS LOCAL_SRC_FILES := $(LOCAL_MODULE).apk -LOCAL_CERTIFICATE := PRESIGNED +LOCAL_CERTIFICATE := platform LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 LOCAL_LICENSE_CONDITIONS := notice LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE |