Update the file structure of ART Services.

- libartservice/Android.bp: Move to libartservice/service/Android.bp.
  (The api folder is automatically moved along with Android.bp.)
- libartservice/tests: Move to libartservice/service/javatests.
- libartservice/tests/Android.bp: Merge into
  libartservice/service/Android.bp.
- artd/binder/android/os/IArtd.aidl: Move to
  art/binder/com/android/server/art/IArtd.aidl.

Bug: 177273468
Test: atest ArtServiceTests
Change-Id: Ia606787150333d0292a68b01fa139278706a71c4
Merged-In: Ia606787150333d0292a68b01fa139278706a71c4
(cherry picked from commit 98250c7a9859d13ff6affa6abdce5d61f26118ca)
diff --git a/artd/artd.cc b/artd/artd.cc
index 1dcd2e8..b52fca3 100644
--- a/artd/artd.cc
+++ b/artd/artd.cc
@@ -22,7 +22,7 @@
 #include <unistd.h>
 #include <utils/Errors.h>
 
-#include "aidl/android/os/BnArtd.h"
+#include "aidl/com/android/server/art/BnArtd.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "tools/tools.h"
@@ -32,7 +32,7 @@
 namespace android {
 namespace artd {
 
-class Artd : public aidl::android::os::BnArtd {
+class Artd : public aidl::com::android::server::art::BnArtd {
   constexpr static const char* const SERVICE_NAME = "artd";
 
  public:
diff --git a/artd/binder/Android.bp b/artd/binder/Android.bp
index 6acfe4e..ad8474f 100644
--- a/artd/binder/Android.bp
+++ b/artd/binder/Android.bp
@@ -25,7 +25,7 @@
 aidl_interface {
     name: "artd-aidl",
     srcs: [
-        "android/os/IArtd.aidl",
+        "com/android/server/art/*.aidl",
     ],
     host_supported: true,
     backend: {
diff --git a/artd/binder/android/os/IArtd.aidl b/artd/binder/com/android/server/art/IArtd.aidl
similarity index 95%
rename from artd/binder/android/os/IArtd.aidl
rename to artd/binder/com/android/server/art/IArtd.aidl
index a16764b..58b2aae 100644
--- a/artd/binder/android/os/IArtd.aidl
+++ b/artd/binder/com/android/server/art/IArtd.aidl
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package android.os;
+package com.android.server.art;
 
 /** {@hide} */
 interface IArtd {
diff --git a/artd/tests/src/com/android/art/ArtdIntegrationTests.java b/artd/tests/src/com/android/art/ArtdIntegrationTests.java
index 7d40adb..2a32972 100644
--- a/artd/tests/src/com/android/art/ArtdIntegrationTests.java
+++ b/artd/tests/src/com/android/art/ArtdIntegrationTests.java
@@ -16,11 +16,12 @@
 
 package com.android.art;
 
-import android.os.IArtd;
 import android.os.IBinder;
 import android.os.RemoteException;
 import android.os.ServiceManager;
 
+import com.android.server.art.IArtd;
+
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/libartservice/Android.bp b/libartservice/service/Android.bp
similarity index 86%
rename from libartservice/Android.bp
rename to libartservice/service/Android.bp
index b9632ea..2caf2c0 100644
--- a/libartservice/Android.bp
+++ b/libartservice/service/Android.bp
@@ -29,7 +29,7 @@
     defaults: ["art_defaults"],
     host_supported: true,
     srcs: [
-        "service/native/service.cc",
+        "native/service.cc",
     ],
     export_include_dirs: ["."],
     apex_available: [
@@ -82,7 +82,7 @@
     compile_dex: true,
 
     srcs: [
-        "service/java/**/*.java",
+        "java/**/*.java",
     ],
 
     libs: [
@@ -95,7 +95,7 @@
 art_cc_defaults {
     name: "art_libartservice_tests_defaults",
     srcs: [
-        "service/native/service_test.cc",
+        "native/service_test.cc",
     ],
     shared_libs: [
         "libbase",
@@ -122,3 +122,25 @@
         "art_libartservice_tests_defaults",
     ],
 }
+
+android_test {
+    name: "ArtServiceTests",
+
+    // Include all test java files.
+    srcs: [
+        "javatests/**/*.java",
+    ],
+
+    static_libs: [
+        "androidx.test.ext.junit",
+        "androidx.test.ext.truth",
+        "androidx.test.runner",
+        "mockito-target-minus-junit4",
+        "service-art.impl",
+    ],
+
+    sdk_version: "system_server_current",
+    min_sdk_version: "31",
+
+    test_suites: ["general-tests"],
+}
diff --git a/libartservice/tests/AndroidManifest.xml b/libartservice/service/AndroidManifest.xml
similarity index 100%
rename from libartservice/tests/AndroidManifest.xml
rename to libartservice/service/AndroidManifest.xml
diff --git a/libartservice/api/current.txt b/libartservice/service/api/current.txt
similarity index 100%
rename from libartservice/api/current.txt
rename to libartservice/service/api/current.txt
diff --git a/libartservice/api/removed.txt b/libartservice/service/api/removed.txt
similarity index 100%
rename from libartservice/api/removed.txt
rename to libartservice/service/api/removed.txt
diff --git a/libartservice/api/system-server-current.txt b/libartservice/service/api/system-server-current.txt
similarity index 100%
rename from libartservice/api/system-server-current.txt
rename to libartservice/service/api/system-server-current.txt
diff --git a/libartservice/api/system-server-removed.txt b/libartservice/service/api/system-server-removed.txt
similarity index 100%
rename from libartservice/api/system-server-removed.txt
rename to libartservice/service/api/system-server-removed.txt
diff --git a/libartservice/tests/src/com/android/server/art/ArtManagerLocalTests.java b/libartservice/service/javatests/com/android/server/art/ArtManagerLocalTest.java
similarity index 96%
rename from libartservice/tests/src/com/android/server/art/ArtManagerLocalTests.java
rename to libartservice/service/javatests/com/android/server/art/ArtManagerLocalTest.java
index b0323c4..a27dfa5 100644
--- a/libartservice/tests/src/com/android/server/art/ArtManagerLocalTests.java
+++ b/libartservice/service/javatests/com/android/server/art/ArtManagerLocalTest.java
@@ -29,7 +29,7 @@
 
 @SmallTest
 @RunWith(MockitoJUnitRunner.class)
-public class ArtManagerLocalTests {
+public class ArtManagerLocalTest {
     private ArtManagerLocal mArtManagerLocal;
 
     @Before
diff --git a/libartservice/tests/Android.bp b/libartservice/tests/Android.bp
deleted file mode 100644
index 1b18cc5..0000000
--- a/libartservice/tests/Android.bp
+++ /dev/null
@@ -1,50 +0,0 @@
-//
-// Copyright (C) 2021 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.
-//
-
-//########################################################################
-// Build ArtServiceTests package
-//########################################################################
-
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "art_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["art_license"],
-}
-
-android_test {
-    name: "ArtServiceTests",
-
-    // Include all test java files.
-    srcs: [
-        "src/**/*.java",
-    ],
-
-    static_libs: [
-        "androidx.test.ext.junit",
-        "androidx.test.ext.truth",
-        "androidx.test.runner",
-        "mockito-target-minus-junit4",
-        "service-art.impl",
-    ],
-
-    sdk_version: "system_server_current",
-    min_sdk_version: "31",
-
-    test_suites: ["general-tests"],
-}