Revert "vendor/lineage: Add support for java source overlays"
This reverts commit af9697550607a5e2d206384b322fe65fe285e85c.
Change-Id: I837a5a8e8523e9e9959abe83dabcc333e87eac17
diff --git a/build/soong/Android.bp b/build/soong/Android.bp
index 382b68e..69f740e 100644
--- a/build/soong/Android.bp
+++ b/build/soong/Android.bp
@@ -2,7 +2,6 @@
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 e926c9d..0000000
--- 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 29247c0..0457f35 100644
--- a/build/soong/android/variable.go
+++ b/build/soong/android/variable.go
@@ -75,7 +75,6 @@
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 dda7978..316b072 100644
--- a/build/soong/soong_config.mk
+++ b/build/soong/soong_config.mk
@@ -8,7 +8,6 @@
$(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)))