From 9f43597ff7349c4facd9e338e5b4b277e625e518 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Thu, 28 May 2020 15:28:00 -0700 Subject: Remove obsolete PDK build functionality This hasn't worked for a couple years, and continues to bitrot. Just remove it. Adds a bpfix rule so that we can eventually remove the product_variables.pdk definition, which is now always a no-op. Test: treehugger Change-Id: I830b54d419b59f6db1d4617b45e61a78234f57a7 Merged-In: I830b54d419b59f6db1d4617b45e61a78234f57a7 --- java/sdk_test.go | 42 ------------------------------------------ 1 file changed, 42 deletions(-) (limited to 'java/sdk_test.go') diff --git a/java/sdk_test.go b/java/sdk_test.go index 13fc915ee..776069dc9 100644 --- a/java/sdk_test.go +++ b/java/sdk_test.go @@ -30,7 +30,6 @@ func TestClasspath(t *testing.T) { var classpathTestcases = []struct { name string unbundled bool - pdk bool moduleType string host android.OsClass properties string @@ -216,35 +215,6 @@ func TestClasspath(t *testing.T) { aidl: "-pprebuilts/sdk/current/public/framework.aidl", }, - { - name: "pdk default", - pdk: true, - bootclasspath: []string{`""`}, - system: "sdk_public_30_system_modules", - java8classpath: []string{"prebuilts/sdk/30/public/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"}, - java9classpath: []string{"prebuilts/sdk/30/public/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"}, - aidl: "-pprebuilts/sdk/30/public/framework.aidl", - }, - { - name: "pdk current", - pdk: true, - properties: `sdk_version: "current",`, - bootclasspath: []string{`""`}, - system: "sdk_public_30_system_modules", - java8classpath: []string{"prebuilts/sdk/30/public/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"}, - java9classpath: []string{"prebuilts/sdk/30/public/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"}, - aidl: "-pprebuilts/sdk/30/public/framework.aidl", - }, - { - name: "pdk 29", - pdk: true, - properties: `sdk_version: "29",`, - bootclasspath: []string{`""`}, - system: "sdk_public_30_system_modules", - java8classpath: []string{"prebuilts/sdk/30/public/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"}, - java9classpath: []string{"prebuilts/sdk/30/public/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"}, - aidl: "-pprebuilts/sdk/30/public/framework.aidl", - }, { name: "module_current", properties: `sdk_version: "module_current",`, @@ -386,9 +356,6 @@ func TestClasspath(t *testing.T) { config.TestProductVariables.Unbundled_build = proptools.BoolPtr(true) config.TestProductVariables.Always_use_prebuilt_sdks = proptools.BoolPtr(true) } - if testcase.pdk { - config.TestProductVariables.Pdk = proptools.BoolPtr(true) - } ctx := testContext() run(t, ctx, config) @@ -410,9 +377,6 @@ func TestClasspath(t *testing.T) { config.TestProductVariables.Unbundled_build = proptools.BoolPtr(true) config.TestProductVariables.Always_use_prebuilt_sdks = proptools.BoolPtr(true) } - if testcase.pdk { - config.TestProductVariables.Pdk = proptools.BoolPtr(true) - } ctx := testContext() run(t, ctx, config) @@ -437,9 +401,6 @@ func TestClasspath(t *testing.T) { config.TestProductVariables.Unbundled_build = proptools.BoolPtr(true) config.TestProductVariables.Always_use_prebuilt_sdks = proptools.BoolPtr(true) } - if testcase.pdk { - config.TestProductVariables.Pdk = proptools.BoolPtr(true) - } ctx := testContext() run(t, ctx, config) @@ -456,9 +417,6 @@ func TestClasspath(t *testing.T) { config.TestProductVariables.Unbundled_build = proptools.BoolPtr(true) config.TestProductVariables.Always_use_prebuilt_sdks = proptools.BoolPtr(true) } - if testcase.pdk { - config.TestProductVariables.Pdk = proptools.BoolPtr(true) - } ctx := testContext() run(t, ctx, config) -- cgit v1.2.3-59-g8ed1b