commit 17fd1a979015f282438645edc4ecdd84d647f0bc
author Alan Viverette <alanv@google.com> Mon Nov 28 17:28:14 2022 +0000
committer Alan Viverette <alanv@google.com> Mon Nov 28 12:30:23 2022 -0500
tree f0ca5debc38badfeb8943107d8b356dd89ba665d
parent 6a93b0e7d49316428b7af652068a8fae287392df

Revert "Don't define targetSdk for emoji2 libraries"

This reverts commit 94eaf8f01ce202bb07c1665d23b49c8c9b810d2f.

Reason for revert: Workaround is obsolete

Change-Id: Id24d6c7511dea26b88b9df119ee1b830415c8062

emoji2/emoji2-bundled/build.gradle

diff --git a/emoji2/emoji2-bundled/build.gradle b/emoji2/emoji2-bundled/build.gradle
index 9e9cca6..0ea043e 100644
--- a/emoji2/emoji2-bundled/build.gradle
+++ b/emoji2/emoji2-bundled/build.gradle
@@ -27,10 +27,6 @@
     }
     namespace "androidx.emoji2.bundled"
 
-    // Workaround for b/230466571 where targetSdkVersion gets merged incorrectly.
-    defaultConfig {
-        targetSdk null
-    }
 }
 
 dependencies {

emoji2/emoji2-views-helper/build.gradle

diff --git a/emoji2/emoji2-views-helper/build.gradle b/emoji2/emoji2-views-helper/build.gradle
index 791cdec..c177372 100644
--- a/emoji2/emoji2-views-helper/build.gradle
+++ b/emoji2/emoji2-views-helper/build.gradle
@@ -24,11 +24,6 @@
 
 android {
     namespace "androidx.emoji2.viewsintegration"
-
-    // Workaround for b/230466571 where targetSdkVersion gets merged incorrectly.
-    defaultConfig {
-        targetSdk null
-    }
 }
 
 androidx {

emoji2/emoji2-views/build.gradle

diff --git a/emoji2/emoji2-views/build.gradle b/emoji2/emoji2-views/build.gradle
index 5333ac1..a53c92e 100644
--- a/emoji2/emoji2-views/build.gradle
+++ b/emoji2/emoji2-views/build.gradle
@@ -30,11 +30,6 @@
         }
     }
     namespace "androidx.emoji2.widget"
-
-    // Workaround for b/230466571 where targetSdkVersion gets merged incorrectly.
-    defaultConfig {
-        targetSdk null
-    }
 }
 
 androidx {

emoji2/emoji2/build.gradle

diff --git a/emoji2/emoji2/build.gradle b/emoji2/emoji2/build.gradle
index 4abee4a..888aa92 100644
--- a/emoji2/emoji2/build.gradle
+++ b/emoji2/emoji2/build.gradle
@@ -46,9 +46,4 @@
 
 android {
     namespace "androidx.emoji2"
-
-    // Workaround for b/230466571 where targetSdkVersion gets merged incorrectly.
-    defaultConfig {
-        targetSdk null
-    }
 }