Blaster4385/device_google_lynx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[conflict] Remove unused Android.mk under device/google/lynx am: eaadd11df8 am: 09d48f9094

Browse source 
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>
This commit is contained in:
Herbert Xue 2023-11-21 02:43:50 +00:00 committed by Automerger Merge Worker
commit 1ac9cb790f
3 changed files with 1 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
Android.mk
View file

@ -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

0
self-extractors/Android.mk
View file

2
self-extractors/google_devices/staging/Android.mk → self-extractors/google_devices/staging/Android.mk.template
View file

@ -48,7 +48,7 @@ LOCAL_PRIVILEGED_MODULE := true
LOCAL_MODULE_OWNER := samsung LOCAL_MODULE_OWNER := samsung
LOCAL_MODULE_CLASS := APPS LOCAL_MODULE_CLASS := APPS
LOCAL_SRC_FILES := $(LOCAL_MODULE).apk LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
LOCAL_CERTIFICATE := PRESIGNED LOCAL_CERTIFICATE := platform
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE