Downgrade to compileSdkVersion 26
Summary: Go back to using compileSdkVersion 26 and targetSdkVersion 26, temporarily. We can re-add this once Android SDK 27 becomes available in Facebook's internal repository. The Android SDK Build Tools 27.0.3 **are** available, so we can continue using those. Reviewed By: axe-fb Differential Revision: D9886607 fbshipit-source-id: 6c1c9c1e1309c3a0483cc4c0bd8dcb4a5f29fc7e
This commit is contained in:
parent
44dc283bcd
commit
68c7999c25
|
@ -1,6 +1,6 @@
|
|||
|
||||
[android]
|
||||
target = android-27
|
||||
target = android-26
|
||||
|
||||
[download]
|
||||
max_number_of_retries = 3
|
||||
|
|
|
@ -28,11 +28,11 @@ aliases:
|
|||
|
||||
- &restore-cache-android-packages
|
||||
keys:
|
||||
- v1-android-sdkmanager-packages-api-27-alpha-{{ checksum "scripts/.tests.env" }}
|
||||
- v1-android-sdkmanager-packages-api-26-alpha-{{ checksum "scripts/.tests.env" }}
|
||||
- &save-cache-android-packages
|
||||
paths:
|
||||
- /opt/android/sdk
|
||||
key: v1-android-sdkmanager-packages-api-27-alpha-{{ checksum "scripts/.tests.env" }}
|
||||
key: v1-android-sdkmanager-packages-api-26-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-27-node8-alpha
|
||||
- image: circleci/android:api-26-node8-alpha
|
||||
resource_class: "large"
|
||||
environment:
|
||||
- TERM: "dumb"
|
||||
|
|
|
@ -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=27
|
||||
ARG ANDROID_BUILD_VERSION=26
|
||||
ARG ANDROID_TOOLS_VERSION=27.0.3
|
||||
ARG BUCK_VERSION=v2018.07.23.01
|
||||
ARG NDK_VERSION=17b
|
||||
|
|
|
@ -84,13 +84,13 @@ def enableSeparateBuildPerCPUArchitecture = false
|
|||
def enableProguardInReleaseBuilds = true
|
||||
|
||||
android {
|
||||
compileSdkVersion 27
|
||||
compileSdkVersion 26
|
||||
buildToolsVersion "27.0.3"
|
||||
|
||||
defaultConfig {
|
||||
applicationId "com.facebook.react.uiapp"
|
||||
minSdkVersion 16
|
||||
targetSdkVersion 27
|
||||
targetSdkVersion 26
|
||||
versionCode 1
|
||||
versionName "1.0"
|
||||
ndk {
|
||||
|
|
|
@ -246,12 +246,12 @@ task packageReactNdkLibsForBuck(dependsOn: packageReactNdkLibs, type: Copy) {
|
|||
}
|
||||
|
||||
android {
|
||||
compileSdkVersion 27
|
||||
compileSdkVersion 26
|
||||
buildToolsVersion "27.0.3"
|
||||
|
||||
defaultConfig {
|
||||
minSdkVersion 16
|
||||
targetSdkVersion 27
|
||||
targetSdkVersion 26
|
||||
versionCode 1
|
||||
versionName "1.0"
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
environment:
|
||||
ANDROID_HOME: "C:\\android-sdk-windows"
|
||||
ANDROID_NDK: "C:\\android-sdk-windows\\android-ndk-r17b"
|
||||
ANDROID_BUILD_VERSION: 27
|
||||
ANDROID_BUILD_VERSION: 26
|
||||
ANDROID_TOOLS_VERSION: 27.0.3
|
||||
|
||||
GRADLE_OPTS: -Dorg.gradle.daemon=false
|
||||
|
|
|
@ -4,8 +4,8 @@ buildscript {
|
|||
ext {
|
||||
buildToolsVersion = "27.0.3"
|
||||
minSdkVersion = 16
|
||||
compileSdkVersion = 27
|
||||
targetSdkVersion = 27
|
||||
compileSdkVersion = 26
|
||||
targetSdkVersion = 26
|
||||
supportLibVersion = "27.1.1"
|
||||
}
|
||||
repositories {
|
||||
|
|
|
@ -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="27"
|
||||
export ANDROID_SDK_BUILD_API_LEVEL="26"
|
||||
# Google APIs for Android level
|
||||
export ANDROID_GOOGLE_API_LEVEL="23"
|
||||
# Minimum Android API Level we target
|
||||
|
@ -31,4 +31,3 @@ if [ $CI ]; then
|
|||
# Use ARM on Circle CI
|
||||
export AVD_ABI=armeabi-v7a
|
||||
fi
|
||||
|
||||
|
|
Loading…
Reference in New Issue