StrixOS/vendor_strix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix GSI targets

Browse Source 
Inherit from AOSP gsi_{arch}.mk, because aosp_{arch}.mk files
are obsolete in Android 12. Rename for consistency with
AOSP gsi/sdk targets.

Change-Id: I449390521307ff4f269a9ebf1ad3a5ffc398bc97
This commit is contained in:
Tom Pratt
2022-03-03 10:54:03 +01:00
committed by Bruno Martins
parent 4fef411428
commit c86992e0cd
5 changed files with 24 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
build/target/product/AndroidProducts.mk
View File

@@ -15,10 +15,10 @@
#
PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/lineage_arm.mk \
$(LOCAL_DIR)/lineage_arm64.mk \
$(LOCAL_DIR)/lineage_x86.mk \
$(LOCAL_DIR)/lineage_x86_64.mk \
$(LOCAL_DIR)/lineage_gsi_arm.mk \
$(LOCAL_DIR)/lineage_gsi_arm64.mk \
$(LOCAL_DIR)/lineage_gsi_x86.mk \
$(LOCAL_DIR)/lineage_gsi_x86_64.mk \
$(LOCAL_DIR)/lineage_tv_arm.mk \
$(LOCAL_DIR)/lineage_tv_arm64.mk \
$(LOCAL_DIR)/lineage_tv_x86.mk \
@@ -31,10 +31,10 @@ PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/lineage_sdk_tv_x86.mk
COMMON_LUNCH_CHOICES := \
lineage_arm-userdebug \
lineage_arm64-userdebug \
lineage_x86-userdebug \
lineage_x86_64-userdebug \
lineage_gsi_arm-userdebug \
lineage_gsi_arm64-userdebug \
lineage_gsi_x86-userdebug \
lineage_gsi_x86_64-userdebug \
lineage_tv_arm-userdebug \
lineage_tv_arm64-userdebug \
lineage_tv_x86-userdebug \

10
build/target/product/lineage_arm64.mk → build/target/product/lineage_gsi_arm.mk
View File

@@ -12,14 +12,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
$(call inherit-product, build/target/product/aosp_arm64.mk)
$(call inherit-product, build/target/product/gsi_release.mk)
$(call inherit-product, device/generic/common/gsi_arm.mk)
include vendor/lineage/build/target/product/lineage_generic_target.mk
PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true
TARGET_NO_KERNEL_OVERRIDE := true
# Enable mainline checking
PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
PRODUCT_NAME := lineage_arm64
PRODUCT_NAME := lineage_gsi_arm

11
build/target/product/lineage_arm.mk → build/target/product/lineage_gsi_arm64.mk
View File

@@ -12,15 +12,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
$(call inherit-product, build/target/product/aosp_arm.mk)
$(call inherit-product, build/target/product/gsi_release.mk)
$(call inherit-product, device/generic/common/gsi_arm64.mk)
include vendor/lineage/build/target/product/lineage_generic_target.mk
PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true
TARGET_NO_KERNEL_OVERRIDE := true
TARGET_USES_64_BIT_BINDER := true
# Enable mainline checking
PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
PRODUCT_NAME := lineage_arm
PRODUCT_NAME := lineage_gsi_arm64

10
build/target/product/lineage_x86_64.mk → build/target/product/lineage_gsi_x86.mk
View File

@@ -12,14 +12,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
$(call inherit-product, build/target/product/aosp_x86_64.mk)
$(call inherit-product, build/target/product/gsi_release.mk)
$(call inherit-product, device/generic/common/gsi_x86.mk)
include vendor/lineage/build/target/product/lineage_generic_target.mk
PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true
TARGET_NO_KERNEL_OVERRIDE := true
# Enable mainline checking
PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
PRODUCT_NAME := lineage_x86_64
PRODUCT_NAME := lineage_gsi_x86

11
build/target/product/lineage_x86.mk → build/target/product/lineage_gsi_x86_64.mk
View File

@@ -12,15 +12,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
$(call inherit-product, build/target/product/aosp_x86.mk)
$(call inherit-product, build/target/product/gsi_release.mk)
$(call inherit-product, device/generic/common/gsi_x86_64.mk)
include vendor/lineage/build/target/product/lineage_generic_target.mk
TARGET_USES_64_BIT_BINDER := true
PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true
TARGET_NO_KERNEL_OVERRIDE := true
# Enable mainline checking
PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
PRODUCT_NAME := lineage_x86
PRODUCT_NAME := lineage_gsi_x86_64