diff --git a/build/soong/Android.bp b/build/soong/Android.bp index 382b68ee..69f740e5 100644 --- a/build/soong/Android.bp +++ b/build/soong/Android.bp @@ -2,7 +2,6 @@ bootstrap_go_package { name: "soong-lineage", pkgPath: "lineage/soong/android", srcs: [ - "android/config.go", "android/variable.go", ], } diff --git a/build/soong/android/config.go b/build/soong/android/config.go deleted file mode 100644 index e926c9d8..00000000 --- a/build/soong/android/config.go +++ /dev/null @@ -1,13 +0,0 @@ -package android - -// Global config used by Lineage soong additions -var LineageConfig = struct { - // List of packages that are permitted - // for java source overlays. - JavaSourceOverlayModuleWhitelist []string -}{ - // JavaSourceOverlayModuleWhitelist - []string{ - "org.lineageos.hardware", - }, -} diff --git a/build/soong/android/variable.go b/build/soong/android/variable.go index 29247c01..0457f352 100644 --- a/build/soong/android/variable.go +++ b/build/soong/android/variable.go @@ -75,7 +75,6 @@ type ProductVariables struct { Apply_msm8974_1440p_egl_workaround *bool `json:",omitempty"` Bootloader_message_offset *int `json:",omitempty"` Has_legacy_camera_hal1 *bool `json:",omitempty"` - Java_Source_Overlays *string `json:",omitempty"` Should_skip_waiting_for_qsee *bool `json:",omitempty"` Specific_camera_parameter_library *string `json:",omitempty"` Supports_hw_fde *bool `json:",omitempty"` diff --git a/build/soong/soong_config.mk b/build/soong/soong_config.mk index dda79782..316b0721 100644 --- a/build/soong/soong_config.mk +++ b/build/soong/soong_config.mk @@ -8,7 +8,6 @@ $(call add_json_str_omitempty, Additional_gralloc_10_usage_bits, $(TARGET_ADDITI $(call add_json_bool, Apply_msm8974_1440p_egl_workaround, $(filter true,$(TARGET_MSM8974_1440P_EGL_WORKAROUND))) $(call add_json_val_default, Bootloader_message_offset, $(BOOTLOADER_MESSAGE_OFFSET), 0) $(call add_json_bool, Has_legacy_camera_hal1, $(filter true,$(TARGET_HAS_LEGACY_CAMERA_HAL1))) -$(call add_json_str, Java_Source_Overlays, $(JAVA_SOURCE_OVERLAYS)) $(call add_json_bool, Should_skip_waiting_for_qsee, $(filter true,$(TARGET_KEYMASTER_SKIP_WAITING_FOR_QSEE))) $(call add_json_str, Specific_camera_parameter_library, $(TARGET_SPECIFIC_CAMERA_PARAMETER_LIBRARY)) $(call add_json_bool, Supports_hw_fde, $(filter true,$(TARGET_HW_DISK_ENCRYPTION)))