diff --git a/doc/cn/DevelopmentPreparation.md b/doc/cn/DevelopmentPreparation.md index b86e19d12789fddfd2336986615f1de6674d45db..dfa793e0d458c2bb5d066f2ca2d22b6a350e1fb3 100644 --- a/doc/cn/DevelopmentPreparation.md +++ b/doc/cn/DevelopmentPreparation.md @@ -119,8 +119,7 @@ AOSP下载地址:https://source.android.com/source/downloading/ 下载AOSP并编译完成。 * 在openarkcompiler目录下新建链接`android/`,并链接到AOSP的根目录; -* 将`openarkcompiler/android/out/target/product/generic_arm64/obj/JAVA_LIBRARIES/core-libart_intermediates/javalib.jar`拷贝到`openarkcompiler/libjava-core/libart.jar` -* 将`openarkcompiler/android/out/target/product/generic_arm64/obj/JAVA_LIBRARIES/core-oj_intermediates/javalib.jar`拷贝到`openarkcompiler/libjava-core/oj.jar` +* 将`openarkcompiler/android/out/target/product/generic_arm64/obj/JAVA_LIBRARIES/core-all_intermediates/javalib.jar`拷贝到`openarkcompiler/libjava-core`目录,并命名为`java-core.jar`,同时码云上也提供了编译好的libcore的jar文件,你可以下载直接使用,下载链接`https://gitee.com/xlnb/aosp_core_bin`; * 在openarkcompiler/tools下新建链接gcc,并链接到AOSP的`openarkcompiler/android/prebuilts/gcc`; * 在openarkcompiler/tools下新建链接clang-r353983c,并链接到AOSP的`openarkcompiler/android/prebuilts/clang/host/linux-x86/clang-r353983c`; * 修改`openarkcompiler/build/config.gni`和`openarkcompiler/build/core/maple_variables.mk`中`ANDROID_GCC_PATH`和`ANDROID_CLANG_PATH`两个变量,配置为上述gcc和clang-r353982c的所在路径,例如: diff --git a/tools/setup_tools.sh b/tools/setup_tools.sh index 43e6a0a78112067bc4029eebf0407f2e0d3e8078..8d6efbeb075d9aee442174c5de9a21750f130e68 100755 --- a/tools/setup_tools.sh +++ b/tools/setup_tools.sh @@ -84,18 +84,18 @@ if [ ! -d $ANDROID_DIR/out/target/product/generic_arm64/obj ]; then . ./build/envsetup.sh lunch 2 make -j32 + make core-all ln -s $ANDROID_SRCDIR $ANDROID_DIR echo Downloaded and built AOSP. fi # create java-core.jar -if [ ! -f $MAPLE_ROOT/libjava-core/libart.jar ]; then +if [ ! -f $MAPLE_ROOT/libjava-core/java-core.jar ]; then mkdir -p $MAPLE_ROOT/libjava-core JLIBDIR=$ANDROID_DIR/out/target/product/generic_arm64/obj/JAVA_LIBRARIES - cp -f $JLIBDIR/core-libart_intermediates/javalib.jar $MAPLE_ROOT/libjava-core/libart.jar - cp -f $JLIBDIR/core-oj_intermediates/javalib.jar $MAPLE_ROOT/libjava-core/oj.jar + cp -f $JLIBDIR/core-all_intermediates/javalib.jar $MAPLE_ROOT/libjava-core/java-core.jar cd $MAPLE_ROOT/libjava-core - $MAPLE_ROOT/build/d8 --min-api 39 --output . libart.jar oj.jar + $MAPLE_ROOT/build/d8 --min-api 39 --output . java-core.jar mv classes.dex libcore-all.dex echo Copied jar files. fi