diff options
| author | Dan Shi <dshi@google.com> | 2020-10-06 15:46:58 -0700 |
|---|---|---|
| committer | Dan Shi <dshi@google.com> | 2020-10-08 10:38:08 -0700 |
| commit | ee0b81a4fe6dc2f9c80427b0f0511185c33f2e51 (patch) | |
| tree | fdfcf2a40b282e14b986841c9973a2acd4490b1d /androidmk | |
| parent | 36e4ad1f4dcb517a741680be1fdd1d14241f8ad5 (diff) | |
| download | soong-ee0b81a4fe6dc2f9c80427b0f0511185c33f2e51.tar.gz | |
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
Diffstat (limited to 'androidmk')
| -rw-r--r-- | androidmk/androidmk/android.go | 3 | ||||
| -rw-r--r-- | androidmk/androidmk/androidmk_test.go | 13 |
2 files changed, 1 insertions, 15 deletions
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 @@ -1257,19 +1257,6 @@ prebuilt_firmware { `, }, { - desc: "vts_config", - in: ` -include $(CLEAR_VARS) -LOCAL_MODULE := vtsconf -include test/vts/tools/build/Android.host_config.mk -`, - expected: ` -vts_config { - name: "vtsconf", -} -`, - }, - { desc: "comment with ESC", in: ` # Comment line 1 \ |