diff --git a/target/product/virtual_ab_ota.mk b/target/product/virtual_ab_ota.mk deleted file mode 100644 index e4c45758ba..0000000000 --- a/target/product/virtual_ab_ota.mk +++ /dev/null @@ -1,21 +0,0 @@ -# -# 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. -# - -PRODUCT_VIRTUAL_AB_OTA := true - -PRODUCT_VENDOR_PROPERTIES += ro.virtual_ab.enabled=true - -PRODUCT_PACKAGES += e2fsck_ramdisk diff --git a/target/product/virtual_ab_ota.mk b/target/product/virtual_ab_ota.mk new file mode 120000 index 0000000000..16f73290b9 --- /dev/null +++ b/target/product/virtual_ab_ota.mk @@ -0,0 +1 @@ +virtual_ab_ota/launch.mk \ No newline at end of file diff --git a/target/product/virtual_ab_ota/README.md b/target/product/virtual_ab_ota/README.md new file mode 100644 index 0000000000..c1d0d7d8d6 --- /dev/null +++ b/target/product/virtual_ab_ota/README.md @@ -0,0 +1,14 @@ +# Virtual A/B makefiles + +Devices that uses Virtual A/B must inherit from one of the makefiles in this directory. + +## Structure + +``` +launch.mk + |- retrofit.mk + |- plus_non_ab.mk + |- compression.mk + +compression_retrofit.mk +``` diff --git a/target/product/virtual_ab_ota_compression.mk b/target/product/virtual_ab_ota/compression.mk similarity index 98% rename from target/product/virtual_ab_ota_compression.mk rename to target/product/virtual_ab_ota/compression.mk index 4bab55ed8c..2251187375 100644 --- a/target/product/virtual_ab_ota_compression.mk +++ b/target/product/virtual_ab_ota/compression.mk @@ -14,7 +14,7 @@ # limitations under the License. # -$(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota/launch.mk) PRODUCT_VENDOR_PROPERTIES += ro.virtual_ab.compression.enabled=true diff --git a/target/product/virtual_ab_ota_compression_retrofit.mk b/target/product/virtual_ab_ota/compression_retrofit.mk similarity index 100% rename from target/product/virtual_ab_ota_compression_retrofit.mk rename to target/product/virtual_ab_ota/compression_retrofit.mk diff --git a/target/product/virtual_ab_ota/launch.mk b/target/product/virtual_ab_ota/launch.mk new file mode 100644 index 0000000000..e4c45758ba --- /dev/null +++ b/target/product/virtual_ab_ota/launch.mk @@ -0,0 +1,21 @@ +# +# 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. +# + +PRODUCT_VIRTUAL_AB_OTA := true + +PRODUCT_VENDOR_PROPERTIES += ro.virtual_ab.enabled=true + +PRODUCT_PACKAGES += e2fsck_ramdisk diff --git a/target/product/virtual_ab_ota/plus_non_ab.mk b/target/product/virtual_ab_ota/plus_non_ab.mk new file mode 100644 index 0000000000..820fa1ebe7 --- /dev/null +++ b/target/product/virtual_ab_ota/plus_non_ab.mk @@ -0,0 +1,21 @@ +# +# Copyright (C) 2020 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. +# + +$(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota/launch.mk) + +PRODUCT_OTA_FORCE_NON_AB_PACKAGE := true + +PRODUCT_VENDOR_PROPERTIES += ro.virtual_ab.allow_non_ab=true diff --git a/target/product/virtual_ab_ota/retrofit.mk b/target/product/virtual_ab_ota/retrofit.mk new file mode 100644 index 0000000000..93b42b7acb --- /dev/null +++ b/target/product/virtual_ab_ota/retrofit.mk @@ -0,0 +1,21 @@ +# +# 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. +# + +$(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota/launch.mk) + +PRODUCT_VIRTUAL_AB_OTA_RETROFIT := true + +PRODUCT_VENDOR_PROPERTIES += ro.virtual_ab.retrofit=true diff --git a/target/product/virtual_ab_ota_plus_non_ab.mk b/target/product/virtual_ab_ota_plus_non_ab.mk deleted file mode 100644 index 99a10ed9c3..0000000000 --- a/target/product/virtual_ab_ota_plus_non_ab.mk +++ /dev/null @@ -1,21 +0,0 @@ -# -# Copyright (C) 2020 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. -# - -$(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota.mk) - -PRODUCT_OTA_FORCE_NON_AB_PACKAGE := true - -PRODUCT_VENDOR_PROPERTIES += ro.virtual_ab.allow_non_ab=true diff --git a/target/product/virtual_ab_ota_plus_non_ab.mk b/target/product/virtual_ab_ota_plus_non_ab.mk new file mode 120000 index 0000000000..4979957cc4 --- /dev/null +++ b/target/product/virtual_ab_ota_plus_non_ab.mk @@ -0,0 +1 @@ +virtual_ab_ota/plus_non_ab.mk \ No newline at end of file diff --git a/target/product/virtual_ab_ota_retrofit.mk b/target/product/virtual_ab_ota_retrofit.mk deleted file mode 100644 index 3416a4fd81..0000000000 --- a/target/product/virtual_ab_ota_retrofit.mk +++ /dev/null @@ -1,21 +0,0 @@ -# -# 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. -# - -$(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota.mk) - -PRODUCT_VIRTUAL_AB_OTA_RETROFIT := true - -PRODUCT_VENDOR_PROPERTIES += ro.virtual_ab.retrofit=true diff --git a/target/product/virtual_ab_ota_retrofit.mk b/target/product/virtual_ab_ota_retrofit.mk new file mode 120000 index 0000000000..1e16ca8b62 --- /dev/null +++ b/target/product/virtual_ab_ota_retrofit.mk @@ -0,0 +1 @@ +virtual_ab_ota/retrofit.mk \ No newline at end of file