LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Convert MultiDisplay/Android.mk to Android.bp" am: 9e504cc4c5 am: 45950f4fc4

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/development/+/1689115

Change-Id: I7a24591841b7a54d9ba967cd19452da334686b76
This commit is contained in:
Yuntao Xu
2021-04-30 17:30:36 +00:00
committed by Automerger Merge Worker
parent 859f63e840 45950f4fc4
commit 7dfe30b1ae
2 changed files with 32 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
samples/MultiDisplay/Android.bp Normal file
View File

@@ -0,0 +1,32 @@
//
// Copyright (C) 2018 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.
//
package {
// See: http://go/android-license-faq
default_applicable_licenses: ["Android-Apache-2.0"],
}
android_app {
name: "MultiDisplay",
// Only compile source java files in this apk.
srcs: ["src/**/*.java"],
static_libs: [
"com.google.android.material_material",
"androidx.lifecycle_lifecycle-livedata",
"androidx.lifecycle_lifecycle-viewmodel",
],
sdk_version: "current",
}

36
samples/MultiDisplay/Android.mk
View File

@@ -1,36 +0,0 @@
#
# Copyright (C) 2018 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_TAGS := samples
# Only compile source java files in this apk.
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_STATIC_ANDROID_LIBRARIES += \
com.google.android.material_material \
androidx.lifecycle_lifecycle-livedata \
androidx.lifecycle_lifecycle-viewmodel
LOCAL_PACKAGE_NAME := MultiDisplay
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_SDK_VERSION := current
include $(BUILD_PACKAGE)