From 5b0ad15d39bc0facb8800c23729ceebdb32f7685 Mon Sep 17 00:00:00 2001 From: "Rohit Jain (MOD)" Date: Mon, 11 Mar 2019 14:20:00 +0530 Subject: [PATCH 1/2] Moving v8 modules to third-party folder --- ReactAndroid/build.gradle | 4 ++-- ReactAndroid/src/main/jni/Application.mk | 2 +- ReactAndroid/src/main/jni/{ => third-party}/v8/Android.mk | 0 ReactAndroid/src/main/jni/{ => third-party}/v8/base.mk | 0 ReactAndroid/src/main/jni/{ => third-party}/v8base/Android.mk | 0 .../src/main/jni/{ => third-party}/v8platform/Android.mk | 0 6 files changed, 3 insertions(+), 3 deletions(-) rename ReactAndroid/src/main/jni/{ => third-party}/v8/Android.mk (100%) rename ReactAndroid/src/main/jni/{ => third-party}/v8/base.mk (100%) rename ReactAndroid/src/main/jni/{ => third-party}/v8base/Android.mk (100%) rename ReactAndroid/src/main/jni/{ => third-party}/v8platform/Android.mk (100%) diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle index 7955df1d77f0f5..19d17a7c8002fa 100644 --- a/ReactAndroid/build.gradle +++ b/ReactAndroid/build.gradle @@ -204,7 +204,7 @@ task buildReactNdkLib(dependsOn: [prepareBoost, prepareDoubleConversion, prepare 'NDK_OUT=' + temporaryDir, "NDK_LIBS_OUT=$buildDir/react-ndk/all", "THIRD_PARTY_NDK_DIR=$buildDir/third-party-ndk", - "REACT_V8_DIR=$projectDir/src/main/jni/v8", + "THIRD_PARTY_NDK_SRC_DIR=$projectDir/src/main/jni/third-party", "V8_NUGET_DIR=$projectDir/$V8Path", "REACT_COMMON_DIR=$projectDir/../ReactCommon", "REACT_SRC_DIR=$projectDir/src/main/java/com/facebook/react", @@ -216,7 +216,7 @@ task cleanReactNdkLib(type: Exec) { commandLine getNdkBuildFullPath(), "NDK_APPLICATION_MK=$projectDir/src/main/jni/Application.mk", "THIRD_PARTY_NDK_DIR=$buildDir/third-party-ndk", - "REACT_V8_DIR=$projectDir/src/main/jni/v8", + "THIRD_PARTY_NDK_SRC_DIR=$projectDir/src/main/jni/third-party", "V8_NUGET_DIR=$projectDir/$V8Path", "REACT_COMMON_DIR=$projectDir/../ReactCommon", "REACT_SRC_DIR=$projectDir/src/main/java/com/facebook/react", diff --git a/ReactAndroid/src/main/jni/Application.mk b/ReactAndroid/src/main/jni/Application.mk index 2fa8867462a4eb..612e487583386f 100644 --- a/ReactAndroid/src/main/jni/Application.mk +++ b/ReactAndroid/src/main/jni/Application.mk @@ -5,7 +5,7 @@ APP_PLATFORM := android-16 APP_MK_DIR := $(dir $(lastword $(MAKEFILE_LIST))) -NDK_MODULE_PATH := $(APP_MK_DIR)$(HOST_DIRSEP)$(THIRD_PARTY_NDK_DIR)$(HOST_DIRSEP)$(REACT_COMMON_DIR)$(HOST_DIRSEP)$(APP_MK_DIR)first-party$(HOST_DIRSEP)$(REACT_V8_DIR)$(HOST_DIRSEP)$(REACT_V8_DIR)/../v8base$(HOST_DIRSEP)$(REACT_V8_DIR)/../v8platform +NDK_MODULE_PATH := $(APP_MK_DIR)$(HOST_DIRSEP)$(THIRD_PARTY_NDK_DIR)$(HOST_DIRSEP)$(REACT_COMMON_DIR)$(HOST_DIRSEP)$(APP_MK_DIR)first-party$(HOST_DIRSEP)$(THIRD_PARTY_NDK_SRC_DIR)$(HOST_DIRSEP) APP_STL := gnustl_shared diff --git a/ReactAndroid/src/main/jni/v8/Android.mk b/ReactAndroid/src/main/jni/third-party/v8/Android.mk similarity index 100% rename from ReactAndroid/src/main/jni/v8/Android.mk rename to ReactAndroid/src/main/jni/third-party/v8/Android.mk diff --git a/ReactAndroid/src/main/jni/v8/base.mk b/ReactAndroid/src/main/jni/third-party/v8/base.mk similarity index 100% rename from ReactAndroid/src/main/jni/v8/base.mk rename to ReactAndroid/src/main/jni/third-party/v8/base.mk diff --git a/ReactAndroid/src/main/jni/v8base/Android.mk b/ReactAndroid/src/main/jni/third-party/v8base/Android.mk similarity index 100% rename from ReactAndroid/src/main/jni/v8base/Android.mk rename to ReactAndroid/src/main/jni/third-party/v8base/Android.mk diff --git a/ReactAndroid/src/main/jni/v8platform/Android.mk b/ReactAndroid/src/main/jni/third-party/v8platform/Android.mk similarity index 100% rename from ReactAndroid/src/main/jni/v8platform/Android.mk rename to ReactAndroid/src/main/jni/third-party/v8platform/Android.mk From c7ea4937981821bbd6da6bb91f4d3deb8064542a Mon Sep 17 00:00:00 2001 From: "REDMOND\\acoates" Date: Mon, 11 Mar 2019 16:18:24 -0700 Subject: [PATCH 2/2] Test commit to poke circleci --- .github/CODEOWNERS | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index b9d084bf849cf8..7159762751a4ee 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,14 +1 @@ -Libraries/Animated/* @janicduplessis -Libraries/NativeAnimation/* @janicduplessis -Libraries/Image/* @shergin -Libraries/Text/* @shergin -React/Base/* @shergin -React/Views/* @shergin -React/Modules/* @shergin -React/CxxBridge/* @mhorowitz -ReactAndroid/src/main/java/com/facebook/react/animated/* @janicduplessis -**/*.md @hramos -package.json @hramos -local-cli/core/* @grabbou @kureev -local-cli/link/* @grabbou @kureev -local-cli/unlink/* @grabbou @kureev +** @acoates-ms