commit e3c574c0c54238ea9ca2378ba7e32976d3df9c89
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Aug 04 05:03:30 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Aug 04 05:03:30 2023 +0000
tree 72f5d244f9b700886de48ba053a97c7259f56e85
parent 38babfe02e295b710978a2db7e5d0525062e3883
parent f001dfd9f3bf3af0247a8467eaa07f4bd4656a12

Merge "Remove references to the pdk product variable" into main am: e6ca015645 am: bcd1192abc am: e13f95ec26 am: dfa1dd31a6 am: f001dfd9f3

Original change: https://android-review.googlesource.com/c/platform/dalvik/+/2693367

Change-Id: I1d8b4ecaeec4111b9e049a04928bcd7f9464b680
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

dx/Android.bp

diff --git a/dx/Android.bp b/dx/Android.bp
index b8ace1f..bd44d16 100644
--- a/dx/Android.bp
+++ b/dx/Android.bp
@@ -1,10 +1,6 @@
 // Copyright 2006 The Android Open Source Project
 //
 
-// This tool is prebuilt if we're doing an app-only build.
-// ANDROIDMK TRANSLATION ERROR: unsupported conditional
-// ifeq ($(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK)),)
-
 // dx java library
 // ============================================================
 package {
@@ -30,11 +26,6 @@
     srcs: ["src/**/*.java"],
     manifest: "etc/manifest.txt",
     java_version: "1.7",
-    product_variables: {
-        pdk: {
-            enabled: false,
-        },
-    },
 }
 
 java_binary_host {