Revert "add macro to provide versioned aidl_interfaces"

This reverts commit 764d5d7505818dbf70eee1f395593d756c16fc91.

Reason for revert: aidl_interface is breaking tradefed CI because that module type doesn't exist for that CI config

Change-Id: Ieaee44a0eef89a386a39cc19af4c7578c39923df

16 files changed, 0 insertions, 458 deletions

diff --git a/examples/aidl/Android.bp b/examples/aidl/Android.bp
deleted file mode 100644
index 69555569..00000000
--- a/examples/aidl/Android.bp
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright (C) 2022 The Android Open Source Project
-//
-// 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.
-
-aidl_interface {
-    name: "example-dep-aidl-interfaces",
-    local_include_dir: "src",
-    srcs: [
-        "src/a/b/AB.aidl",
-    ],
-    backend: {
-        java: {
-            min_sdk_version: "29",
-        },
-        ndk: {
-            enabled: false,
-        },
-        cpp: {
-            enabled: false,
-        },
-    },
-    versions: [
-        "1",
-    ],
-
-}
-
-aidl_interface {
-    name: "example-aidl-interfaces",
-    local_include_dir: "src",
-    srcs: [
-        "src/c/d/CD.aidl",
-        "src/c/d/CD2.aidl",
-    ],
-    backend: {
-        java: {
-            min_sdk_version: "29",
-        },
-        ndk: {
-            enabled: false,
-        },
-        cpp: {
-            enabled: false,
-        },
-    },
-    imports: ["example-dep-aidl-interfaces-V1"],
-    versions: [
-        "1",
-        "2",
-    ],
-}
-
-java_library {
-    name: "example-aidl-latest",
-    sdk_version: "system_current",
-    min_sdk_version: "29",
-    static_libs: [
-        "example-aidl-interfaces-V2-java",
-    ],
-}
-
-java_library {
-    name: "example-aidl-test",
-    sdk_version: "system_current",
-    min_sdk_version: "29",
-    srcs: ["src/android/Test.java"],
-    static_libs: ["example-aidl-latest"],
-}
diff --git a/examples/aidl/aidl_api/example-aidl-interfaces/1/.hash b/examples/aidl/aidl_api/example-aidl-interfaces/1/.hash
deleted file mode 100644
index 1476380e..00000000
--- a/examples/aidl/aidl_api/example-aidl-interfaces/1/.hash
+++ /dev/null
@@ -1 +0,0 @@
-7a2a02e4b16e621d09a7a59fc731b9d905d2d6cb
diff --git a/examples/aidl/aidl_api/example-aidl-interfaces/1/c/d/CD.aidl b/examples/aidl/aidl_api/example-aidl-interfaces/1/c/d/CD.aidl
deleted file mode 100644
index 42999143..00000000
--- a/examples/aidl/aidl_api/example-aidl-interfaces/1/c/d/CD.aidl
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- *
- * 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.
-*/
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package c.d;
-parcelable CD {
-  int cd;
-  a.b.AB ab;
-}
diff --git a/examples/aidl/aidl_api/example-aidl-interfaces/2/.hash b/examples/aidl/aidl_api/example-aidl-interfaces/2/.hash
deleted file mode 100644
index 6b2371aa..00000000
--- a/examples/aidl/aidl_api/example-aidl-interfaces/2/.hash
+++ /dev/null
@@ -1 +0,0 @@
-4b9bb9dd8400ecf4afc635b7d58193654fbbefc6
diff --git a/examples/aidl/aidl_api/example-aidl-interfaces/2/c/d/CD.aidl b/examples/aidl/aidl_api/example-aidl-interfaces/2/c/d/CD.aidl
deleted file mode 100644
index 42999143..00000000
--- a/examples/aidl/aidl_api/example-aidl-interfaces/2/c/d/CD.aidl
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- *
- * 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.
-*/
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package c.d;
-parcelable CD {
-  int cd;
-  a.b.AB ab;
-}
diff --git a/examples/aidl/aidl_api/example-aidl-interfaces/2/c/d/CD2.aidl b/examples/aidl/aidl_api/example-aidl-interfaces/2/c/d/CD2.aidl
deleted file mode 100644
index 8f1ed5dc..00000000
--- a/examples/aidl/aidl_api/example-aidl-interfaces/2/c/d/CD2.aidl
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- *
- * 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.
-*/
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package c.d;
-parcelable CD2 {
-  int cd;
-  a.b.AB ab;
-}
diff --git a/examples/aidl/aidl_api/example-aidl-interfaces/current/c/d/CD.aidl b/examples/aidl/aidl_api/example-aidl-interfaces/current/c/d/CD.aidl
deleted file mode 100644
index 42999143..00000000
--- a/examples/aidl/aidl_api/example-aidl-interfaces/current/c/d/CD.aidl
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- *
- * 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.
-*/
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package c.d;
-parcelable CD {
-  int cd;
-  a.b.AB ab;
-}
diff --git a/examples/aidl/aidl_api/example-aidl-interfaces/current/c/d/CD2.aidl b/examples/aidl/aidl_api/example-aidl-interfaces/current/c/d/CD2.aidl
deleted file mode 100644
index 8f1ed5dc..00000000
--- a/examples/aidl/aidl_api/example-aidl-interfaces/current/c/d/CD2.aidl
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- *
- * 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.
-*/
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package c.d;
-parcelable CD2 {
-  int cd;
-  a.b.AB ab;
-}
diff --git a/examples/aidl/aidl_api/example-dep-aidl-interfaces/1/.hash b/examples/aidl/aidl_api/example-dep-aidl-interfaces/1/.hash
deleted file mode 100644
index 9a27f6ff..00000000
--- a/examples/aidl/aidl_api/example-dep-aidl-interfaces/1/.hash
+++ /dev/null
@@ -1 +0,0 @@
-11afd58790f61f5f3916e01d58622b8e4769eb3c
diff --git a/examples/aidl/aidl_api/example-dep-aidl-interfaces/1/a/b/AB.aidl b/examples/aidl/aidl_api/example-dep-aidl-interfaces/1/a/b/AB.aidl
deleted file mode 100644
index db6bebfa..00000000
--- a/examples/aidl/aidl_api/example-dep-aidl-interfaces/1/a/b/AB.aidl
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- *
- * 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.
-*/
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package a.b;
-parcelable AB {
-  int ab;
-}
diff --git a/examples/aidl/aidl_api/example-dep-aidl-interfaces/current/a/b/AB.aidl b/examples/aidl/aidl_api/example-dep-aidl-interfaces/current/a/b/AB.aidl
deleted file mode 100644
index db6bebfa..00000000
--- a/examples/aidl/aidl_api/example-dep-aidl-interfaces/current/a/b/AB.aidl
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- *
- * 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.
-*/
-///////////////////////////////////////////////////////////////////////////////
-// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
-///////////////////////////////////////////////////////////////////////////////
-
-// This file is a snapshot of an AIDL file. Do not edit it manually. There are
-// two cases:
-// 1). this is a frozen version file - do not edit this in any case.
-// 2). this is a 'current' file. If you make a backwards compatible change to
-//     the interface (from the latest frozen version), the build system will
-//     prompt you to update this file with `m <name>-update-api`.
-//
-// You must not make a backward incompatible change to any AIDL file built
-// with the aidl_interface module type with versions property set. The module
-// type is used to build AIDL files in a way that they can be used across
-// independently updatable components of the system. If a device is shipped
-// with such a backward incompatible change, it has a high risk of breaking
-// later when a module using the interface is updated, e.g., Mainline modules.
-
-package a.b;
-parcelable AB {
-  int ab;
-}
diff --git a/examples/aidl/src/a/b/AB.aidl b/examples/aidl/src/a/b/AB.aidl
deleted file mode 100644
index c468afa5..00000000
--- a/examples/aidl/src/a/b/AB.aidl
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- *
- * 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.
-*/
-
-package a.b;
-
-parcelable AB {
-    int ab;
-}
diff --git a/examples/aidl/src/a/b/AB2.aidl b/examples/aidl/src/a/b/AB2.aidl
deleted file mode 100644
index c83ad99a..00000000
--- a/examples/aidl/src/a/b/AB2.aidl
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- *
- * 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.
-*/
-
-package a.b;
-
-parcelable AB2 {
-    int ab;
-}
diff --git a/examples/aidl/src/android/Test.java b/examples/aidl/src/android/Test.java
deleted file mode 100644
index 32389778..00000000
--- a/examples/aidl/src/android/Test.java
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (C) 2022 The Android Open Source Project
-//
-// 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.
-
-package android;
-
-import c.d.CD;
-import c.d.CD2;
-
-class Test {
-  CD cd;
-  CD2 cd2;
-}
diff --git a/examples/aidl/src/c/d/CD.aidl b/examples/aidl/src/c/d/CD.aidl
deleted file mode 100644
index 24cf74e8..00000000
--- a/examples/aidl/src/c/d/CD.aidl
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- *
- * 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.
-*/
-
-package c.d;
-
-import a.b.AB;
-
-parcelable CD {
-    int cd;
-    AB ab;
-}
diff --git a/examples/aidl/src/c/d/CD2.aidl b/examples/aidl/src/c/d/CD2.aidl
deleted file mode 100644
index b0b50816..00000000
--- a/examples/aidl/src/c/d/CD2.aidl
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- *
- * 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.
-*/
-
-package c.d;
-
-import a.b.AB;
-
-parcelable CD2 {
-    int cd;
-    AB ab;
-}