diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-11-30 23:42:16 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-30 23:42:16 +0000 |
| commit | 2425e9cf3f5ed3e4ab63f1cf31712a60a9bb577d (patch) | |
| tree | 30194f5ccff307d5158af66c4105c412317ff676 | |
| parent | 301db1885fcda93a20adb288515e141194ce67e4 (diff) | |
| parent | d8adecbb16cf6102080966b05fdb66d7044ec76a (diff) | |
| download | goldfish-2425e9cf3f5ed3e4ab63f1cf31712a60a9bb577d.tar.gz | |
Merge "Prepare to retire vendor.mk and emulator64_vendor.mk" into main am: d8adecbb16
Original change: https://android-review.googlesource.com/c/device/generic/goldfish/+/2854547
Change-Id: I95f5bf0a41d2b63b7eda4ef7893449761fecc03c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | 64bitonly/product/emulator64_vendor.mk | 3 | ||||
| -rw-r--r-- | product/phone.mk | 18 | ||||
| -rw-r--r-- | product/tablet.mk | 18 |
3 files changed, 37 insertions, 2 deletions
diff --git a/64bitonly/product/emulator64_vendor.mk b/64bitonly/product/emulator64_vendor.mk index 10ba0071..cc1b99d0 100644 --- a/64bitonly/product/emulator64_vendor.mk +++ b/64bitonly/product/emulator64_vendor.mk @@ -31,5 +31,4 @@ endif PRODUCT_CHARACTERISTICS := emulator -# goldfish vendor partition configurations -$(call inherit-product-if-exists, device/generic/goldfish/64bitonly/product/vendor.mk) +$(call inherit-product, device/generic/goldfish/product/generic.mk) diff --git a/product/phone.mk b/product/phone.mk new file mode 100644 index 00000000..e20a05da --- /dev/null +++ b/product/phone.mk @@ -0,0 +1,18 @@ +# +# Copyright (C) 2023 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. + +# All phone specific stuff should be moved here. + +$(call inherit-product, device/generic/goldfish/product/generic.mk) diff --git a/product/tablet.mk b/product/tablet.mk new file mode 100644 index 00000000..4c671f1b --- /dev/null +++ b/product/tablet.mk @@ -0,0 +1,18 @@ +# +# Copyright (C) 2023 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. + +# All tablet specific stuff should be moved here. + +$(call inherit-product, device/generic/goldfish/product/generic.mk) |