From 5068dfcad34a79112ba7c0ae67a0ce71b6ab10bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ramos?= <hramos@fb.com>
Date: Thu, 20 Sep 2018 07:42:13 -0700
Subject: [PATCH] Use Android SDK 27 in React Native

Summary:
Upgrade React Native to Android SDK 27 again, following the reversal in D9886607 (https://github.com/facebook/react-native/commit/68c7999c25efbc6fabf67e4130ac086c401b88e0).

The SDK 27 is actually available internally in an alternate location that is suitable for use cases like React Native's. For future reference, SDK 28 is also available for use in this location.

Reviewed By: axe-fb

Differential Revision: D9929066

fbshipit-source-id: 9413f891d5587293a30544351340e9407a2dce55
---
 .buckconfig                                         | 2 +-
 .circleci/config.yml                                | 6 +++---
 ContainerShip/Dockerfile.android-base               | 2 +-
 RNTester/android/app/build.gradle                   | 4 ++--
 ReactAndroid/build.gradle                           | 4 ++--
 appveyor.yml                                        | 2 +-
 local-cli/templates/HelloWorld/android/build.gradle | 4 ++--
 scripts/.tests.env                                  | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.buckconfig b/.buckconfig
index 753e239a98bfff..963190d2b61a10 100644
--- a/.buckconfig
+++ b/.buckconfig
@@ -1,6 +1,6 @@
 
 [android]
-  target = android-26
+  target = android-27
 
 [download]
   max_number_of_retries = 3
diff --git a/.circleci/config.yml b/.circleci/config.yml
index d944eafdc1e7e9..275132d1e81787 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -28,11 +28,11 @@ aliases:
 
   - &restore-cache-android-packages
     keys:
-      - v1-android-sdkmanager-packages-api-26-alpha-{{ checksum "scripts/.tests.env" }}
+      - v1-android-sdkmanager-packages-api-27-alpha-{{ checksum "scripts/.tests.env" }}
   - &save-cache-android-packages
     paths:
       - /opt/android/sdk
-    key: v1-android-sdkmanager-packages-api-26-alpha-{{ checksum "scripts/.tests.env" }}
+    key: v1-android-sdkmanager-packages-api-27-alpha-{{ checksum "scripts/.tests.env" }}
 
   - &restore-cache-gradle
     keys:
@@ -333,7 +333,7 @@ js_defaults: &js_defaults
 android_defaults: &android_defaults
   <<: *defaults
   docker:
-    - image: circleci/android:api-26-node8-alpha
+    - image: circleci/android:api-27-node8-alpha
   resource_class: "large"
   environment:
     - TERM: "dumb"
diff --git a/ContainerShip/Dockerfile.android-base b/ContainerShip/Dockerfile.android-base
index 2b64b0b4d1eede..6cbc6438c75bdf 100644
--- a/ContainerShip/Dockerfile.android-base
+++ b/ContainerShip/Dockerfile.android-base
@@ -18,7 +18,7 @@ LABEL maintainer="Héctor Ramos <hector@fb.com>"
 
 # set default build arguments
 ARG SDK_VERSION=sdk-tools-linux-3859397.zip
-ARG ANDROID_BUILD_VERSION=26
+ARG ANDROID_BUILD_VERSION=27
 ARG ANDROID_TOOLS_VERSION=27.0.3
 ARG BUCK_VERSION=v2018.07.23.01
 ARG NDK_VERSION=17b
diff --git a/RNTester/android/app/build.gradle b/RNTester/android/app/build.gradle
index a30f36ec34a9c5..74ebe61ad8c47d 100644
--- a/RNTester/android/app/build.gradle
+++ b/RNTester/android/app/build.gradle
@@ -84,13 +84,13 @@ def enableSeparateBuildPerCPUArchitecture = false
 def enableProguardInReleaseBuilds = true
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 27
     buildToolsVersion "27.0.3"
 
     defaultConfig {
         applicationId "com.facebook.react.uiapp"
         minSdkVersion 16
-        targetSdkVersion 26
+        targetSdkVersion 27
         versionCode 1
         versionName "1.0"
         ndk {
diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle
index 3d8d7fc9966e19..85ccc73762f766 100644
--- a/ReactAndroid/build.gradle
+++ b/ReactAndroid/build.gradle
@@ -246,12 +246,12 @@ task packageReactNdkLibsForBuck(dependsOn: packageReactNdkLibs, type: Copy) {
 }
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 27
     buildToolsVersion "27.0.3"
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 26
+        targetSdkVersion 27
         versionCode 1
         versionName "1.0"
 
diff --git a/appveyor.yml b/appveyor.yml
index 0516fa7bc4f4e6..61fe51b3069ac6 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,7 +1,7 @@
 environment:
     ANDROID_HOME: "C:\\android-sdk-windows"
     ANDROID_NDK: "C:\\android-sdk-windows\\android-ndk-r17b"
-    ANDROID_BUILD_VERSION: 26
+    ANDROID_BUILD_VERSION: 27
     ANDROID_TOOLS_VERSION: 27.0.3
 
     GRADLE_OPTS: -Dorg.gradle.daemon=false
diff --git a/local-cli/templates/HelloWorld/android/build.gradle b/local-cli/templates/HelloWorld/android/build.gradle
index 4dfefca65b876a..f939d78227a997 100644
--- a/local-cli/templates/HelloWorld/android/build.gradle
+++ b/local-cli/templates/HelloWorld/android/build.gradle
@@ -4,8 +4,8 @@ buildscript {
     ext {
         buildToolsVersion = "27.0.3"
         minSdkVersion = 16
-        compileSdkVersion = 26
-        targetSdkVersion = 26
+        compileSdkVersion = 27
+        targetSdkVersion = 27
         supportLibVersion = "27.1.1"
     }
     repositories {
diff --git a/scripts/.tests.env b/scripts/.tests.env
index 3439b235835b66..062c6ceabb6577 100644
--- a/scripts/.tests.env
+++ b/scripts/.tests.env
@@ -6,7 +6,7 @@
 # Android SDK Build Tools revision
 export ANDROID_SDK_BUILD_TOOLS_REVISION=27.0.3
 # Android API Level we build with
-export ANDROID_SDK_BUILD_API_LEVEL="26"
+export ANDROID_SDK_BUILD_API_LEVEL="27"
 # Google APIs for Android level
 export ANDROID_GOOGLE_API_LEVEL="23"
 # Minimum Android API Level we target