From 5112a6395378eb79886b00859e05609cf9c9424c Mon Sep 17 00:00:00 2001 From: Konstantin Raev Date: Thu, 25 Feb 2016 16:39:29 -0800 Subject: [PATCH] Added ability to run Movies app with BUCK Reviewed By: mkonicek Differential Revision: D2874873 fb-gh-sync-id: 9feface8d9a18742e68206dbafb804de25f53ed8 shipit-source-id: 9feface8d9a18742e68206dbafb804de25f53ed8 --- .buckconfig | 3 + .gitignore | 2 + Examples/Movies/android/app/BUCK | 43 ++++++++++++++ .../android/app/src/main/AndroidManifest.xml | 1 + .../android/app/src/main/AndroidManifest.xml | 1 + .../app/src/main/java/UIExplorerActivity.java | 2 +- ReactAndroid/build.gradle | 5 ++ .../android/support/v7/appcompat-orig/BUCK | 36 +++-------- .../com/facebook/react/views/switchview/BUCK | 1 - .../toolbar/DrawableWithIntrinsicSize.java | 9 ++- .../react/views/toolbar/ReactToolbar.java | 9 ++- .../java/com/facebook/common/logging/BUCK | 15 +++-- .../main/third-party/android/support/v4/BUCK | 2 +- .../android/support/v7/appcompat-orig/BUCK | 56 +++++++++++++++++- .../v7/appcompat-orig/aar-unpacker.py} | 6 +- .../src/main/third-party/java/jsr-305/BUCK | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- keystores/BUCK | 8 +++ keystores/debug.keystore | Bin 0 -> 2257 bytes keystores/debug.keystore.properties | 4 ++ 20 files changed, 158 insertions(+), 49 deletions(-) create mode 100644 Examples/Movies/android/app/BUCK rename ReactAndroid/src/main/{android_res/android/support/v7/appcompat-orig/res-unpacker.py => third-party/android/support/v7/appcompat-orig/aar-unpacker.py} (70%) create mode 100644 keystores/BUCK create mode 100644 keystores/debug.keystore create mode 100644 keystores/debug.keystore.properties diff --git a/.buckconfig b/.buckconfig index 934256cb29d4a3..9f6c686b2fc18a 100644 --- a/.buckconfig +++ b/.buckconfig @@ -4,3 +4,6 @@ [maven_repositories] central = https://repo1.maven.org/maven2 + +[alias] + movies = //Examples/Movies/android/app:app diff --git a/.gitignore b/.gitignore index fe61f843f91de6..cd545b912fdc72 100644 --- a/.gitignore +++ b/.gitignore @@ -29,6 +29,8 @@ project.xcworkspace # Buck .buckd buck-out +/ReactAndroid/src/main/jni/prebuilt/lib/armeabi-v7a/ +/ReactAndroid/src/main/jni/prebuilt/lib/x86/ # Android .idea diff --git a/Examples/Movies/android/app/BUCK b/Examples/Movies/android/app/BUCK new file mode 100644 index 00000000000000..25c73fd5441544 --- /dev/null +++ b/Examples/Movies/android/app/BUCK @@ -0,0 +1,43 @@ +include_defs('//ReactAndroid/DEFS') + +android_binary( + name = 'app', + manifest = 'src/main/AndroidManifest.xml', + keystore = '//keystores:debug', + deps = [ + ':movies-lib', + ], +) + +android_library( + name = 'movies-lib', + srcs = glob(['src/main/java/**/*.java']), + deps = [ + react_native_target('java/com/facebook/csslayout:csslayout'), + react_native_target('java/com/facebook/react:react'), + react_native_target('java/com/facebook/react/devsupport:devsupport'), + react_native_target('java/com/facebook/react/modules/core:core'), + react_native_target('java/com/facebook/react/shell:shell'), + react_native_target('java/com/facebook/react/touch:touch'), + react_native_target('java/com/facebook/react/uimanager:uimanager'), + react_native_target('java/com/facebook/react/uimanager/annotations:annotations'), + react_native_target('java/com/facebook/react/views/image:image'), + react_native_target('java/com/facebook/react/views/recyclerview:recyclerview'), + react_native_target('java/com/facebook/react/views/scroll:scroll'), + react_native_target('java/com/facebook/react/views/text:text'), + react_native_target('java/com/facebook/react/views/view:view'), + # .so files are prebuilt by Gradle with `./gradlew :ReactAndroid:packageReactNdkLibsForBuck` + react_native_target('jni/prebuilt:reactnative-libs'), + react_native_target('jni/prebuilt:android-jsc'), + react_native_dep('libraries/soloader/java/com/facebook/soloader:soloader'), + react_native_dep('third-party/java/jsr-305:jsr-305'), + ':res', + ], +) + + +android_resource( + name = 'res', + res = 'src/main/res', + package = 'com.facebook.react.movies', +) diff --git a/Examples/Movies/android/app/src/main/AndroidManifest.xml b/Examples/Movies/android/app/src/main/AndroidManifest.xml index 185ffa5060219d..8aaec60819da5b 100644 --- a/Examples/Movies/android/app/src/main/AndroidManifest.xml +++ b/Examples/Movies/android/app/src/main/AndroidManifest.xml @@ -3,6 +3,7 @@ + + st5|P)KF1_Z;y){W{<7K{nl!CPuE z_^(!C(Ol0n8 zK13*rzAtW>(wULKPRYLd7G18F8#1P`V*9`(Poj26eOXYyBVZPno~Cvvhx7vPjAuZo zF?VD!zB~QG(!zbw#qsxT8%BSpqMZ4f70ZPn-3y$L8{EVbbN9$H`B&Z1quk9tgp5FM zuxp3pJ0b8u|3+#5bkJ4SRnCF2l7#DyLYXYY8*?OuAwK4E6J{0N=O3QNVzQ$L#FKkR zi-c@&!nDvezOV$i$Lr}iF$XEcwnybQ6WZrMKuw8gCL^U#D;q3t&HpTbqyD%vG=TeDlzCT~MXUPC|Leb-Uk+ z=vnMd(|>ld?Fh>V8poP;q;;nc@en$|rnP0ytzD&fFkCeUE^kG9Kx4wUh!!rpjwKDP zyw_e|a^x_w3E zP}}@$g>*LLJ4i0`Gx)qltL}@;mDv}D*xR^oeWcWdPkW@Uu)B^X&4W1$p6}ze!zudJ zyiLg@uggoMIArBr*27EZV7djDg@W1MaL+rcZ-lrANJQ%%>u8)ZMWU@R2qtnmG(acP z0d_^!t>}5W zpT`*2NR+0+SpTHb+6Js4b;%LJB;B_-ChhnU5py}iJtku*hm5F0!iql8Hrpcy1aYbT z1*dKC5ua6pMX@@iONI?Hpr%h;&YaXp9n!ND7-=a%BD7v&g zOO41M6EbE24mJ#S$Ui0-brR5ML%@|ndz^)YLMMV1atna{Fw<;TF@>d&F|!Z>8eg>>hkFrV)W+uv=`^F9^e zzzM2*oOjT9%gLoub%(R57p-`TXFe#oh1_{&N-YN z<}artH|m=d8TQuKSWE)Z%puU|g|^^NFwC#N=@dPhasyYjoy(fdEVfKR@cXKHZV-`06HsP`|Ftx;8(YD$fFXumLWbGnu$GMqRncXYY9mwz9$ap zQtfZB^_BeNYITh^hA7+(XNFox5WMeG_LtJ%*Q}$8VKDI_p8^pqX)}NMb`0e|wgF7D zuQACY_Ua<1ri{;Jwt@_1sW9zzdgnyh_O#8y+C;LcZq6=4e^cs6KvmK@$vVpKFGbQ= z$)Eux5C|Fx;Gtmv9^#Y-g@7Rt7*eLp5n!gJmn7&B_L$G?NCN`AP>cXQEz}%F%K;vUs{+l4Q{}eWW;ATe2 zqvXzxoIDy(u;F2q1JH7Sf;{jy_j})F+cKlIOmNfjBGHoG^CN zM|Ho&&X|L-36f}Q-obEACz`sI%2f&k>z5c$2TyTSj~vmO)BW~+N^kt`Jt@R|s!){H ze1_eCrlNaPkJQhL$WG&iRvF*YG=gXd1IyYQ9ew|iYn7r~g!wOnw;@n42>enAxBv*A zEmV*N#sxdicyNM=A4|yaOC5MByts}s_Hpfj|y<6G=o=!3S@eIFKDdpR7|FY>L&Wat&oW&cm&X~ z5Bt>Fcq(fgnvlvLSYg&o6>&fY`ODg4`V^lWWD=%oJ#Kbad2u~! zLECFS*??>|vDsNR&pH=Ze0Eo`sC_G`OjoEKVHY|wmwlX&(XBE<@sx3Hd^gtd-fNwUHsylg06p`U2y_={u}Bc