diff options
author | Aurimas Liutikas <aurimas@google.com> | 2022-06-28 16:37:07 -0700 |
---|---|---|
committer | Aurimas Liutikas <aurimas@google.com> | 2022-06-29 21:30:57 +0000 |
commit | 1150dc40fa83a351643a4eb617830fd829a54170 (patch) | |
tree | 6127a283ac033a2e11bf7a97f77445ab94fe3372 | |
parent | 8f16167c39d77866a213b0ef042058e858255d47 (diff) | |
download | icing-1150dc40fa83a351643a4eb617830fd829a54170.tar.gz |
Migrate from AndroidManifest to build.gradle for namespace
AGP has deprecated use of packageName in AndroidManifest and
instead wants everyone to use `android { namespace = "foo" }`
in build.gradle files.
Test: ./gradlew tasks -> still passes
Change-Id: I90dc17b95823683a49b4e6b669eca8b534b2aa95
-rw-r--r-- | AndroidManifest.xml | 2 | ||||
-rw-r--r-- | build.gradle | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml deleted file mode 100644 index 7377c53..0000000 --- a/AndroidManifest.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<manifest package="com.google.android.icing" /> diff --git a/build.gradle b/build.gradle index 5b5f3a6..2ac1d39 100644 --- a/build.gradle +++ b/build.gradle @@ -42,13 +42,13 @@ android { sourceSets { main { java.srcDir 'java/src/' - manifest.srcFile 'AndroidManifest.xml' proto.srcDir 'proto/' } // TODO(b/161205849): Re-enable this test once icing nativeLib is no longer being built // inside appsearch:appsearch. //androidTest.java.srcDir 'java/tests/instrumentation/' } + namespace "com.google.android.icing" } dependencies { |