Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f701b28 authored by Kiyoung Kim's avatar Kiyoung Kim
Browse files

Remove VSDK related code from build 

Remove leftover VSDK related code from build, as they are no longer in
use.

Bug: 332986564
Test: AOSP CF build succeeded
Change-Id: Idb34adc37022e71603f150200635ef1fb81e8ec4
parent 8a9a52d1

core/soong_config.mk

+0 −21
Original line number Diff line number Diff line
@@ -152,7 +152,6 @@ $(call add_json_list, DeviceKernelHeaders, $(TARGET_DEVICE_KERNEL_ 
$(call add_json_str,  VendorApiLevel,                    $(BOARD_API_LEVEL))

$(call add_json_list, ExtraVndkVersions,                 $(PRODUCT_EXTRA_VNDK_VERSIONS))

$(call add_json_list, DeviceSystemSdkVersions,           $(BOARD_SYSTEMSDK_VERSIONS))

$(call add_json_str,  RecoverySnapshotVersion,           $(RECOVERY_SNAPSHOT_VERSION))

$(call add_json_list, Platform_systemsdk_versions,       $(PLATFORM_SYSTEMSDK_VERSIONS))

$(call add_json_bool, Malloc_low_memory,                 $(findstring true,$(MALLOC_SVELTE) $(MALLOC_LOW_MEMORY)))

$(call add_json_bool, Malloc_zero_contents,              $(call invert_bool,$(filter false,$(MALLOC_ZERO_CONTENTS))))
@@ -167,8 +166,6 @@ $(call add_json_list, ModulesLoadedByPrivilegedModules, $(PRODUCT_LOADED_BY_PRI 
$(call add_json_list, BootJars,                          $(PRODUCT_BOOT_JARS))

$(call add_json_list, ApexBootJars,                      $(filter-out $(APEX_BOOT_JARS_EXCLUDED), $(PRODUCT_APEX_BOOT_JARS)))



$(call add_json_bool, VndkSnapshotBuildArtifacts,        $(VNDK_SNAPSHOT_BUILD_ARTIFACTS))



$(call add_json_map,  BuildFlags)

$(foreach flag,$(_ALL_RELEASE_FLAGS),\

  $(call add_json_str,$(flag),$(_ALL_RELEASE_FLAGS.$(flag).VALUE)))
@@ -178,24 +175,6 @@ $(foreach flag,$(_ALL_RELEASE_FLAGS),\ 
  $(call add_json_str,$(flag),$(_ALL_RELEASE_FLAGS.$(flag).TYPE)))

$(call end_json_map)



$(call add_json_bool, DirectedVendorSnapshot,            $(DIRECTED_VENDOR_SNAPSHOT))

$(call add_json_map,  VendorSnapshotModules)

$(foreach module,$(VENDOR_SNAPSHOT_MODULES),\

  $(call add_json_bool,$(module),true))

$(call end_json_map)



$(call add_json_bool, DirectedRecoverySnapshot,          $(DIRECTED_RECOVERY_SNAPSHOT))

$(call add_json_map,  RecoverySnapshotModules)

$(foreach module,$(RECOVERY_SNAPSHOT_MODULES),\

  $(call add_json_bool,$(module),true))

$(call end_json_map)



$(call add_json_list, VendorSnapshotDirsIncluded,        $(VENDOR_SNAPSHOT_DIRS_INCLUDED))

$(call add_json_list, VendorSnapshotDirsExcluded,        $(VENDOR_SNAPSHOT_DIRS_EXCLUDED))

$(call add_json_list, RecoverySnapshotDirsIncluded,      $(RECOVERY_SNAPSHOT_DIRS_INCLUDED))

$(call add_json_list, RecoverySnapshotDirsExcluded,      $(RECOVERY_SNAPSHOT_DIRS_EXCLUDED))

$(call add_json_bool, HostFakeSnapshotEnabled,           $(HOST_FAKE_SNAPSHOT_ENABLE))



$(call add_json_bool, MultitreeUpdateMeta,               $(filter true,$(TARGET_MULTITREE_UPDATE_META)))



$(call add_json_bool, Treble_linker_namespaces,          $(filter true,$(PRODUCT_TREBLE_LINKER_NAMESPACES)))

core/tasks/recovery_snapshot.mk

deleted100644 → 0
+0 −34
Original line number Diff line number Diff line 
# Copyright (C) 2020 The Android Open Source Project

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.



current_makefile := $(lastword $(MAKEFILE_LIST))



# RECOVERY_SNAPSHOT_VERSION must be set to 'current' in order to generate a recovery snapshot.

ifeq ($(RECOVERY_SNAPSHOT_VERSION),current)



.PHONY: recovery-snapshot

recovery-snapshot: $(SOONG_RECOVERY_SNAPSHOT_ZIP)



$(call dist-for-goals, recovery-snapshot, $(SOONG_RECOVERY_SNAPSHOT_ZIP))



else # RECOVERY_SNAPSHOT_VERSION is NOT set to 'current'



.PHONY: recovery-snapshot

recovery-snapshot: PRIVATE_MAKEFILE := $(current_makefile)

recovery-snapshot:

	$(call echo-error,$(PRIVATE_MAKEFILE),\

		"CANNOT generate Recovery snapshot. RECOVERY_SNAPSHOT_VERSION must be set to 'current'.")

	exit 1



endif # RECOVERY_SNAPSHOT_VERSION

core/tasks/vendor_snapshot.mk

deleted100644 → 0
+0 −46
Original line number Diff line number Diff line 
# Copyright (C) 2020 The Android Open Source Project

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.



current_makefile := $(lastword $(MAKEFILE_LIST))



# BOARD_VNDK_VERSION must be set to 'current' in order to generate a vendor snapshot.

ifeq ($(BOARD_VNDK_VERSION),current)



.PHONY: vendor-snapshot

vendor-snapshot: $(SOONG_VENDOR_SNAPSHOT_ZIP)



$(call dist-for-goals, vendor-snapshot, $(SOONG_VENDOR_SNAPSHOT_ZIP))



.PHONY: vendor-fake-snapshot

vendor-fake-snapshot: $(SOONG_VENDOR_FAKE_SNAPSHOT_ZIP)



$(call dist-for-goals, vendor-fake-snapshot, $(SOONG_VENDOR_FAKE_SNAPSHOT_ZIP):fake/$(notdir $(SOONG_VENDOR_FAKE_SNAPSHOT_ZIP)))



else # BOARD_VNDK_VERSION is NOT set to 'current'



.PHONY: vendor-snapshot

vendor-snapshot: PRIVATE_MAKEFILE := $(current_makefile)

vendor-snapshot:

	$(call echo-error,$(PRIVATE_MAKEFILE),\

		"CANNOT generate Vendor snapshot. BOARD_VNDK_VERSION must be set to 'current'.")

	exit 1



.PHONY: vendor-fake-snapshot

vendor-fake-snapshot: PRIVATE_MAKEFILE := $(current_makefile)

vendor-fake-snapshot:

	$(call echo-error,$(PRIVATE_MAKEFILE),\

		"CANNOT generate Vendor snapshot. BOARD_VNDK_VERSION must be set to 'current'.")

	exit 1



endif # BOARD_VNDK_VERSION