-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Partially revert "Remove unused Android.mk under device/google/sunfish"
Restore required makefiles, based on coral commit. This partially reverts commit 971eaca. Change-Id: I4f4e3fe33649acc769658ca63db652cf0c1b2c61
- Loading branch information
Showing
3 changed files
with
138 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
# | ||
# 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 := [email protected] | ||
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 | ||
LOCAL_LICENSE_CONDITIONS := notice | ||
LOCAL_INIT_RC := [email protected] | ||
LOCAL_MODULE_RELATIVE_PATH := hw | ||
|
||
LOCAL_SRC_FILES := \ | ||
DumpstateDevice.cpp \ | ||
service.cpp | ||
|
||
LOCAL_SHARED_LIBRARIES := \ | ||
[email protected] \ | ||
[email protected] \ | ||
libbase \ | ||
libcutils \ | ||
libdumpstateutil \ | ||
libhidlbase \ | ||
liblog \ | ||
libutils | ||
|
||
LOCAL_CFLAGS := -Werror -Wall | ||
|
||
LOCAL_MODULE_TAGS := optional | ||
LOCAL_PROPRIETARY_MODULE := true | ||
|
||
include $(BUILD_EXECUTABLE) |
26 changes: 26 additions & 0 deletions
26
self-extractors/google_devices/staging/Android.mk.template
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
# | ||
# 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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,68 @@ | ||
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 |