Merge "bump_sdk.sh: fix Ignore-AOSP-First typo" into main
diff --git a/Android.bp b/Android.bp
index 0e70193..ab8a357 100644
--- a/Android.bp
+++ b/Android.bp
@@ -139,18 +139,3 @@
"device-tests",
],
}
-
-// TODO: b/316383039 - Remove this module and the script when udc-mainline-prod
-// branch is removed.
-// The options passed to Metalava when generating API signature files and stubs
-// for SDK extension releases.
-genrule {
- name: "sdkext-released-flagged-apis",
- visibility: [
- "//visibility:public",
- ],
- tool_files: ["keep-flagged-apis.sh"],
- srcs: ["released-flagged-apis.txt"],
- out: ["metalava-keep-flagged-apis.txt"],
- cmd: "$(location keep-flagged-apis.sh) \"$(in)\" > \"$(out)\"",
-}
diff --git a/gen_sdk/Android.bp b/gen_sdk/Android.bp
index e014d5d..cde5935 100644
--- a/gen_sdk/Android.bp
+++ b/gen_sdk/Android.bp
@@ -23,11 +23,6 @@
name: "gen_sdk",
srcs: ["gen_sdk.py"],
libs: ["sdk_proto_python"],
- version: {
- py3: {
- embedded_launcher: true,
- },
- },
}
sh_test_host {
diff --git a/keep-flagged-apis.sh b/keep-flagged-apis.sh
deleted file mode 100755
index efc336c..0000000
--- a/keep-flagged-apis.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash -e
-#
-# Copyright 2023 Google Inc. All rights reserved.
-#
-# 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.
-
-# Convert a list of flags in the input file to a list of metalava options
-# that will keep the APIs for those flags will hiding all other flagged
-# APIs.
-
-FLAGS="$1"
-
-FLAGGED="android.annotation.FlaggedApi"
-
-# Convert the list of feature flags in the input file to Metalava options
-# of the form `--revert-annotation !android.annotation.FlaggedApi("<flag>")`
-# to prevent the annotated APIs from being hidden, i.e. include the annotated
-# APIs in the SDK snapshots. This also preserves the line comments, they will
-# be ignored by Metalava but might be useful when debugging.
-sed "s|^[^#].*$|--revert-annotation '!$FLAGGED(\"\\0\")'|" $FLAGS
-
-# Revert all flagged APIs, unless listed above.
-echo "--revert-annotation $FLAGGED"
