Revert omni soong product variables changes
* This reverts commits 7ef0e170 and 4ed4605 and removes relevant flags
to prepare for using Soong config variables as per Google's docs
Change-Id: Ib6ae5a8a922104d37f8d0e08242b428eb129785c
diff --git a/build/soong/Android.bp b/build/soong/Android.bp
index 9c5a9e0..ba8c782 100644
--- a/build/soong/Android.bp
+++ b/build/soong/Android.bp
@@ -1,12 +1,4 @@
bootstrap_go_package {
- name: "soong-omnirom",
- pkgPath: "omnirom/soong/android",
- srcs: [
- "android/variable.go",
- ],
-}
-
-bootstrap_go_package {
name: "soong-omnirom-generator",
pkgPath: "omnirom/soong/generator",
deps: [
diff --git a/build/soong/android/variable.go b/build/soong/android/variable.go
deleted file mode 100644
index 2246444..0000000
--- a/build/soong/android/variable.go
+++ /dev/null
@@ -1,54 +0,0 @@
-package android
-type Product_variables struct {
- Healthd_use_battery_info struct {
- Cflags []string
- }
- Healthd_enable_tricolor_led struct {
- Cflags []string
- }
- Healthd_enable_op_fastchg struct {
- Cflags []string
- }
- TargetNeedsHWCOnFirstRef struct {
- Cflags []string
- }
- Uses_metadata_as_fde_key struct {
- Cflags []string
- }
- Target_init_vendor_lib struct {
- Static_libs []string
- Cflags []string
- }
- Target_camera_needs_client_info struct {
- Cflags []string
- }
- Target_motorized_camera struct {
- Cflags []string
- }
- Target_enforce_ab_ota_partition_list struct {
- Cflags []string
- }
- Target_surfaceflinger_fod_lib struct {
- Cflags []string
- Whole_static_libs []string
- }
- Target_vold_vendor_lib struct {
- Static_libs []string
- Cflags []string
- }
-}
-
-type ProductVariables struct {
- Healthd_use_battery_info *bool `json:",omitempty"`
- Healthd_enable_tricolor_led *bool `json:",omitempty"`
- Healthd_enable_op_fastchg *bool `json:",omitempty"`
- TargetNeedsHWCOnFirstRef *bool `json:",omitempty"`
- Uses_metadata_as_fde_key *bool `json:",omitempty"`
- Target_use_sdclang *bool `json:",omitempty"`
- Target_camera_needs_client_info *bool `json:",omitempty"`
- Target_motorized_camera *bool `json:",omitempty"`
- Target_init_vendor_lib *string `json:",omitempty"`
- Target_enforce_ab_ota_partition_list *bool `json:",omitempty"`
- Target_surfaceflinger_fod_lib *string `json:",omitempty"`
- Target_vold_vendor_lib *string `json:",omitempty"`
-}
diff --git a/build/soong/soong_config.mk b/build/soong/soong_config.mk
deleted file mode 100644
index d64ff84..0000000
--- a/build/soong/soong_config.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-add_json_str_omitempty = $(if $(strip $(2)),$(call add_json_str, $(1), $(2)))
-
-_json_contents := $(_json_contents) "Omnirom":{$(newline)
-
-# See build/core/soong_config.mk for the add_json_* functions you can use here.
-$(call add_json_bool, Healthd_use_battery_info, $(filter true,$(HEALTHD_USE_BATTERY_INFO)))
-$(call add_json_bool, Healthd_enable_tricolor_led, $(filter true,$(HEALTHD_ENABLE_TRICOLOR_LED)))
-$(call add_json_bool, Healthd_enable_op_fastchg, $(filter true,$(HEALTHD_ENABLE_OP_FASTCHG_CHECK)))
-$(call add_json_bool, TargetNeedsHWCOnFirstRef, $(filter true,$(TARGET_NEEDS_HWC_ONFIRSTREF)))
-$(call add_json_bool, Uses_metadata_as_fde_key, $(filter true,$(TARGET_USES_METADATA_AS_FDE_KEY)))
-$(call add_json_bool, Target_use_sdclang, $(filter true,$(TARGET_USE_SDCLANG)))
-$(call add_json_bool, Target_camera_needs_client_info, $(filter true,$(TARGET_CAMERA_NEEDS_CLIENT_INFO)))
-$(call add_json_bool, Target_motorized_camera, $(filter true,$(TARGET_MOTORIZED_CAMERA)))
-$(call add_json_str_omitempty, Target_init_vendor_lib, $(TARGET_INIT_VENDOR_LIB))
-$(call add_json_bool, Target_enforce_ab_ota_partition_list, $(filter true,$(TARGET_ENFORCE_AB_OTA_PARTITION_LIST)))
-$(call add_json_str_omitempty, Target_surfaceflinger_fod_lib, $(TARGET_SURFACEFLINGER_FOD_LIB))
-$(call add_json_str_omitempty, Target_vold_vendor_lib, $(TARGET_VOLD_VENDOR_LIB))
-
-# This causes the build system to strip out the last comma in our nested struct, to keep the JSON valid.
-_json_contents := $(_json_contents)__SV_END
-
-_json_contents := $(_json_contents) },$(newline)