diff options
| author | Herbert Xue <herbertxue@google.com> | 2023-11-21 02:43:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-21 02:43:51 +0000 |
| commit | 2ddcebecac5d03ea8abc1945e614a29fcae4a3cd (patch) | |
| tree | efba15592ebe8d8fc4cf6230204d751a759d5643 | |
| parent | 1a582f21afcd230140c04263d4515d63563fc1c6 (diff) | |
| parent | 3a915de31c6f427bbdb85e6a477a997dde3e8970 (diff) | |
| download | bluejay-2ddcebecac5d03ea8abc1945e614a29fcae4a3cd.tar.gz | |
[conflict] Remove unused Android.mk under device/google/bluejay am: 34aaf50436 am: 3a915de31c
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25420741
Change-Id: Ibc8eeffdb3ac3fea6b260105465da40b12002740
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 099b64b..0000000 --- a/Android.mk +++ /dev/null @@ -1,30 +0,0 @@ -# -# Copyright (C) 2011 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. - -ifeq ($(USES_DEVICE_GOOGLE_BLUEJAY),true) - include $(call first-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 6c380d9..4bb909d 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 |