From bb2433fdfa9df7b0706edc18d6441df59ad35c30 Mon Sep 17 00:00:00 2001 From: Alexander Dorokhine Date: Fri, 4 Dec 2020 02:59:14 -0800 Subject: [PATCH] Move externally synced framework files to an 'external' folder. Java package paths and the overall API is unaffected. This makes it much easier to maintain the export script. Prior to this CL, the export script had an allowlist of framework files to leave alone. This list was badly out of date and hard to maintain in lockstep with framework. There are no functional changes in this CL. Bug: 162450968 Test: m -j, framework-appsearch.stubs.source-update-current-api, presubmit Change-Id: I5a91f4afb1cfe2aa5e514d5f3159bf212f7de03b --- apex/appsearch/framework/java/{android/app => }/TEST_MAPPING | 0 .../java/{ => external}/android/app/appsearch/AppSearchEmail.java | 0 .../{ => external}/android/app/appsearch/AppSearchSchema.java | 0 .../{ => external}/android/app/appsearch/GenericDocument.java | 0 .../{ => external}/android/app/appsearch/GetByUriRequest.java | 0 .../{ => external}/android/app/appsearch/PutDocumentsRequest.java | 0 .../{ => external}/android/app/appsearch/RemoveByUriRequest.java | 0 .../java/{ => external}/android/app/appsearch/SearchResult.java | 0 .../{ => external}/android/app/appsearch/SearchResultPage.java | 0 .../java/{ => external}/android/app/appsearch/SearchSpec.java | 0 .../{ => external}/android/app/appsearch/SetSchemaRequest.java | 0 .../android/app/appsearch/exceptions/AppSearchException.java | 0 .../android/app/appsearch/exceptions/IllegalSchemaException.java | 0 .../app/appsearch/exceptions/IllegalSearchSpecException.java | 0 .../{ => external}/android/app/appsearch/util/BundleUtil.java | 0 15 files changed, 0 insertions(+), 0 deletions(-) rename apex/appsearch/framework/java/{android/app => }/TEST_MAPPING (100%) rename apex/appsearch/framework/java/{ => external}/android/app/appsearch/AppSearchEmail.java (100%) rename apex/appsearch/framework/java/{ => external}/android/app/appsearch/AppSearchSchema.java (100%) rename apex/appsearch/framework/java/{ => external}/android/app/appsearch/GenericDocument.java (100%) rename apex/appsearch/framework/java/{ => external}/android/app/appsearch/GetByUriRequest.java (100%) rename apex/appsearch/framework/java/{ => external}/android/app/appsearch/PutDocumentsRequest.java (100%) rename apex/appsearch/framework/java/{ => external}/android/app/appsearch/RemoveByUriRequest.java (100%) rename apex/appsearch/framework/java/{ => external}/android/app/appsearch/SearchResult.java (100%) rename apex/appsearch/framework/java/{ => external}/android/app/appsearch/SearchResultPage.java (100%) rename apex/appsearch/framework/java/{ => external}/android/app/appsearch/SearchSpec.java (100%) rename apex/appsearch/framework/java/{ => external}/android/app/appsearch/SetSchemaRequest.java (100%) rename apex/appsearch/framework/java/{ => external}/android/app/appsearch/exceptions/AppSearchException.java (100%) rename apex/appsearch/framework/java/{ => external}/android/app/appsearch/exceptions/IllegalSchemaException.java (100%) rename apex/appsearch/framework/java/{ => external}/android/app/appsearch/exceptions/IllegalSearchSpecException.java (100%) rename apex/appsearch/framework/java/{ => external}/android/app/appsearch/util/BundleUtil.java (100%) diff --git a/apex/appsearch/framework/java/android/app/TEST_MAPPING b/apex/appsearch/framework/java/TEST_MAPPING similarity index 100% rename from apex/appsearch/framework/java/android/app/TEST_MAPPING rename to apex/appsearch/framework/java/TEST_MAPPING diff --git a/apex/appsearch/framework/java/android/app/appsearch/AppSearchEmail.java b/apex/appsearch/framework/java/external/android/app/appsearch/AppSearchEmail.java similarity index 100% rename from apex/appsearch/framework/java/android/app/appsearch/AppSearchEmail.java rename to apex/appsearch/framework/java/external/android/app/appsearch/AppSearchEmail.java diff --git a/apex/appsearch/framework/java/android/app/appsearch/AppSearchSchema.java b/apex/appsearch/framework/java/external/android/app/appsearch/AppSearchSchema.java similarity index 100% rename from apex/appsearch/framework/java/android/app/appsearch/AppSearchSchema.java rename to apex/appsearch/framework/java/external/android/app/appsearch/AppSearchSchema.java diff --git a/apex/appsearch/framework/java/android/app/appsearch/GenericDocument.java b/apex/appsearch/framework/java/external/android/app/appsearch/GenericDocument.java similarity index 100% rename from apex/appsearch/framework/java/android/app/appsearch/GenericDocument.java rename to apex/appsearch/framework/java/external/android/app/appsearch/GenericDocument.java diff --git a/apex/appsearch/framework/java/android/app/appsearch/GetByUriRequest.java b/apex/appsearch/framework/java/external/android/app/appsearch/GetByUriRequest.java similarity index 100% rename from apex/appsearch/framework/java/android/app/appsearch/GetByUriRequest.java rename to apex/appsearch/framework/java/external/android/app/appsearch/GetByUriRequest.java diff --git a/apex/appsearch/framework/java/android/app/appsearch/PutDocumentsRequest.java b/apex/appsearch/framework/java/external/android/app/appsearch/PutDocumentsRequest.java similarity index 100% rename from apex/appsearch/framework/java/android/app/appsearch/PutDocumentsRequest.java rename to apex/appsearch/framework/java/external/android/app/appsearch/PutDocumentsRequest.java diff --git a/apex/appsearch/framework/java/android/app/appsearch/RemoveByUriRequest.java b/apex/appsearch/framework/java/external/android/app/appsearch/RemoveByUriRequest.java similarity index 100% rename from apex/appsearch/framework/java/android/app/appsearch/RemoveByUriRequest.java rename to apex/appsearch/framework/java/external/android/app/appsearch/RemoveByUriRequest.java diff --git a/apex/appsearch/framework/java/android/app/appsearch/SearchResult.java b/apex/appsearch/framework/java/external/android/app/appsearch/SearchResult.java similarity index 100% rename from apex/appsearch/framework/java/android/app/appsearch/SearchResult.java rename to apex/appsearch/framework/java/external/android/app/appsearch/SearchResult.java diff --git a/apex/appsearch/framework/java/android/app/appsearch/SearchResultPage.java b/apex/appsearch/framework/java/external/android/app/appsearch/SearchResultPage.java similarity index 100% rename from apex/appsearch/framework/java/android/app/appsearch/SearchResultPage.java rename to apex/appsearch/framework/java/external/android/app/appsearch/SearchResultPage.java diff --git a/apex/appsearch/framework/java/android/app/appsearch/SearchSpec.java b/apex/appsearch/framework/java/external/android/app/appsearch/SearchSpec.java similarity index 100% rename from apex/appsearch/framework/java/android/app/appsearch/SearchSpec.java rename to apex/appsearch/framework/java/external/android/app/appsearch/SearchSpec.java diff --git a/apex/appsearch/framework/java/android/app/appsearch/SetSchemaRequest.java b/apex/appsearch/framework/java/external/android/app/appsearch/SetSchemaRequest.java similarity index 100% rename from apex/appsearch/framework/java/android/app/appsearch/SetSchemaRequest.java rename to apex/appsearch/framework/java/external/android/app/appsearch/SetSchemaRequest.java diff --git a/apex/appsearch/framework/java/android/app/appsearch/exceptions/AppSearchException.java b/apex/appsearch/framework/java/external/android/app/appsearch/exceptions/AppSearchException.java similarity index 100% rename from apex/appsearch/framework/java/android/app/appsearch/exceptions/AppSearchException.java rename to apex/appsearch/framework/java/external/android/app/appsearch/exceptions/AppSearchException.java diff --git a/apex/appsearch/framework/java/android/app/appsearch/exceptions/IllegalSchemaException.java b/apex/appsearch/framework/java/external/android/app/appsearch/exceptions/IllegalSchemaException.java similarity index 100% rename from apex/appsearch/framework/java/android/app/appsearch/exceptions/IllegalSchemaException.java rename to apex/appsearch/framework/java/external/android/app/appsearch/exceptions/IllegalSchemaException.java diff --git a/apex/appsearch/framework/java/android/app/appsearch/exceptions/IllegalSearchSpecException.java b/apex/appsearch/framework/java/external/android/app/appsearch/exceptions/IllegalSearchSpecException.java similarity index 100% rename from apex/appsearch/framework/java/android/app/appsearch/exceptions/IllegalSearchSpecException.java rename to apex/appsearch/framework/java/external/android/app/appsearch/exceptions/IllegalSearchSpecException.java diff --git a/apex/appsearch/framework/java/android/app/appsearch/util/BundleUtil.java b/apex/appsearch/framework/java/external/android/app/appsearch/util/BundleUtil.java similarity index 100% rename from apex/appsearch/framework/java/android/app/appsearch/util/BundleUtil.java rename to apex/appsearch/framework/java/external/android/app/appsearch/util/BundleUtil.java