Revert bliss 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 1849e7e..0268354 100644
--- a/build/soong/Android.bp
+++ b/build/soong/Android.bp
@@ -1,12 +1,4 @@
bootstrap_go_package {
- name: "soong-bliss",
- pkgPath: "bliss/soong/android",
- srcs: [
- "android/variable.go",
- ],
-}
-
-bootstrap_go_package {
name: "soong-bliss-generator",
pkgPath: "bliss/soong/generator",
deps: [
diff --git a/build/soong/android/variable.go b/build/soong/android/variable.go
deleted file mode 100644
index 5d11cdc..0000000
--- a/build/soong/android/variable.go
+++ /dev/null
@@ -1,87 +0,0 @@
-package android
-type Product_variables struct {
- Additional_gralloc_10_usage_bits struct {
- Cppflags []string
- }
- Bootloader_message_offset struct {
- Cflags []string
- }
- Has_legacy_camera_hal1 struct {
- Cflags []string
- Overrides []string
- Shared_libs []string
- }
- Qcom_um_soong_namespace struct {
- Cflags []string
- Header_libs []string
- }
- Should_wait_for_qsee struct {
- Cflags []string
- }
- Supports_extended_compress_format struct {
- Cflags []string
- }
- Supports_hw_fde struct {
- Cflags []string
- Header_libs []string
- Shared_libs []string
- }
- Supports_hw_fde_perf struct {
- Cflags []string
- }
- Target_ignores_ftp_pptp_conntrack_failure struct {
- Cppflags []string
- }
- Target_init_vendor_lib struct {
- Whole_static_libs []string
- }
- Target_needs_netd_direct_connect_rule struct {
- Cppflags []string
- }
- Target_process_sdk_version_override struct {
- Cppflags []string
- }
- Target_shim_libs struct {
- Cppflags []string
- }
- Target_surfaceflinger_fod_lib struct {
- Cflags []string
- Whole_static_libs []string
- }
- Uses_generic_camera_parameter_library struct {
- Srcs []string
- }
- Uses_nvidia_enhancements struct {
- Cppflags []string
- }
- Uses_qcom_bsp_legacy struct {
- Cppflags []string
- }
- Uses_qti_camera_device struct {
- Cppflags []string
- Shared_libs []string
- }
-}
-
-type ProductVariables struct {
- Additional_gralloc_10_usage_bits *string `json:",omitempty"`
- Bootloader_message_offset *int `json:",omitempty"`
- Has_legacy_camera_hal1 *bool `json:",omitempty"`
- Qcom_um_soong_namespace *string `json:",omitempty"`
- Should_wait_for_qsee *bool `json:",omitempty"`
- Specific_camera_parameter_library *string `json:",omitempty"`
- Supports_extended_compress_format *bool `json:",omitempty"`
- Supports_hw_fde *bool `json:",omitempty"`
- Supports_hw_fde_perf *bool `json:",omitempty"`
- Target_ignores_ftp_pptp_conntrack_failure *bool `json:",omitempty"`
- Target_init_vendor_lib *string `json:",omitempty"`
- Target_needs_netd_direct_connect_rule *bool `json:",omitempty"`
- Target_process_sdk_version_override *string `json:",omitempty"`
- Target_shim_libs *string `json:",omitempty"`
- Target_specific_header_path *string `json:",omitempty"`
- Target_surfaceflinger_fod_lib *string `json:",omitempty"`
- Uses_generic_camera_parameter_library *bool `json:",omitempty"`
- Uses_nvidia_enhancements *bool `json:",omitempty"`
- Uses_qcom_bsp_legacy *bool `json:",omitempty"`
- Uses_qti_camera_device *bool `json:",omitempty"`
-}
diff --git a/build/soong/soong_config.mk b/build/soong/soong_config.mk
deleted file mode 100644
index fe033fa..0000000
--- a/build/soong/soong_config.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-add_json_str_omitempty = $(if $(strip $(2)),$(call add_json_str, $(1), $(2)))
-add_json_val_default = $(call add_json_val, $(1), $(if $(strip $(2)), $(2), $(3)))
-
-_json_contents := $(_json_contents) "Bliss":{$(newline)
-
-# See build/core/soong_config.mk for the add_json_* functions you can use here.
-$(call add_json_str_omitempty, Additional_gralloc_10_usage_bits, $(TARGET_ADDITIONAL_GRALLOC_10_USAGE_BITS))
-$(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_omitempty, Qcom_um_soong_namespace, $(if $(filter $(UM_PLATFORMS),$(TARGET_BOARD_PLATFORM)),$(QCOM_SOONG_NAMESPACE),))
-$(call add_json_bool, Should_wait_for_qsee, $(filter true,$(TARGET_KEYMASTER_WAIT_FOR_QSEE)))
-$(call add_json_str, Specific_camera_parameter_library, $(TARGET_SPECIFIC_CAMERA_PARAMETER_LIBRARY))
-$(call add_json_bool, Supports_extended_compress_format, $(filter true,$(AUDIO_FEATURE_ENABLED_EXTENDED_COMPRESS_FORMAT)))
-$(call add_json_bool, Supports_hw_fde, $(filter true,$(TARGET_HW_DISK_ENCRYPTION)))
-$(call add_json_bool, Supports_hw_fde_perf, $(filter true,$(TARGET_HW_DISK_ENCRYPTION_PERF)))
-$(call add_json_bool, Target_ignores_ftp_pptp_conntrack_failure, $(filter true,$(TARGET_IGNORES_FTP_PPTP_CONNTRACK_FAILURE)))
-$(call add_json_str_omitempty, Target_init_vendor_lib, $(TARGET_INIT_VENDOR_LIB))
-$(call add_json_bool, Target_needs_netd_direct_connect_rule, $(filter true,$(TARGET_NEEDS_NETD_DIRECT_CONNECT_RULE)))
-$(call add_json_str_omitempty, Target_process_sdk_version_override, $(TARGET_PROCESS_SDK_VERSION_OVERRIDE))
-$(call add_json_str_omitempty, Target_shim_libs, $(subst $(space),:,$(TARGET_LD_SHIM_LIBS)))
-$(call add_json_str_omitempty, Target_specific_header_path, $(TARGET_SPECIFIC_HEADER_PATH))
-$(call add_json_str_omitempty, Target_surfaceflinger_fod_lib, $(TARGET_SURFACEFLINGER_FOD_LIB))
-$(call add_json_bool, Uses_generic_camera_parameter_library, $(if $(TARGET_SPECIFIC_CAMERA_PARAMETER_LIBRARY),,true))
-$(call add_json_bool, Uses_nvidia_enhancements, $(filter TRUE,$(NV_ANDROID_FRAMEWORK_ENHANCEMENTS)))
-$(call add_json_bool, Uses_qcom_bsp_legacy, $(filter true,$(TARGET_USES_QCOM_BSP_LEGACY)))
-$(call add_json_bool, Uses_qti_camera_device, $(filter true,$(TARGET_USES_QTI_CAMERA_DEVICE)))
-
-# 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)