From ee0b81a4fe6dc2f9c80427b0f0511185c33f2e51 Mon Sep 17 00:00:00 2001 From: Dan Shi Date: Tue, 6 Oct 2020 15:46:58 -0700 Subject: Revert "Implement vts_config module" This reverts commit ff36da04e8dc8e368df0c3df571f3ca07c195ca1. Reason for revert: remove vts10 harness and build configs Bug: 169581727 Bug: 166662663 Test: build Change-Id: I090b41c99c2279d24f08e4343289cbdcc7934f5d --- androidmk/androidmk/android.go | 3 +-- androidmk/androidmk/androidmk_test.go | 13 ------------- 2 files changed, 1 insertion(+), 15 deletions(-) (limited to 'androidmk') diff --git a/androidmk/androidmk/android.go b/androidmk/androidmk/android.go index eaf06c59f..739a9658f 100644 --- a/androidmk/androidmk/android.go +++ b/androidmk/androidmk/android.go @@ -953,8 +953,7 @@ var prebuiltTypes = map[string]string{ var soongModuleTypes = map[string]bool{} var includePathToModule = map[string]string{ - "test/vts/tools/build/Android.host_config.mk": "vts_config", - // The rest will be populated dynamically in androidScope below + // The content will be populated dynamically in androidScope below } func mapIncludePath(path string) (string, bool) { diff --git a/androidmk/androidmk/androidmk_test.go b/androidmk/androidmk/androidmk_test.go index 560ea13b9..6e70129f8 100644 --- a/androidmk/androidmk/androidmk_test.go +++ b/androidmk/androidmk/androidmk_test.go @@ -1254,19 +1254,6 @@ prebuilt_firmware { relative_install_path: "bar", proprietary: true, } -`, - }, - { - desc: "vts_config", - in: ` -include $(CLEAR_VARS) -LOCAL_MODULE := vtsconf -include test/vts/tools/build/Android.host_config.mk -`, - expected: ` -vts_config { - name: "vtsconf", -} `, }, { -- cgit v1.2.3-59-g8ed1b