Dear Andorid porting team, Could you please help me, Is there anyways, that can I get to know that, I have the below patch, I would like to know from which android version, branch & the specific commit, the below patch was extracted? so that I can apply the patch smoothly?
https://android-review.googlesource.com/c/platform/system/core/+/633925 As I am trying to apply this patch on the below code base, I am seeing few conflicts & any pointers or inputs regarding the below issue: 1. https://source.android.com/setup/build/downloading Used branch “android-9.0.0_r45” repo init -u https://android.googlesource.com/platform/manifest -b android-9.0.0_r45 2. Setup for build – This step has to be done only once <repo dir> $ source env_setup.sh <repo dir> $ lunch Choose “aosp_x86_64-eng” ssriniv4@chromeserver:~/samba/android_WORKING_DIRECTORY$ mma ============================================ PLATFORM_VERSION_CODENAME=REL PLATFORM_VERSION=9 TARGET_PRODUCT=aosp_x86_64 TARGET_BUILD_VARIANT=eng TARGET_BUILD_TYPE=release TARGET_ARCH=x86_64 TARGET_ARCH_VARIANT=x86_64 TARGET_2ND_ARCH=x86 TARGET_2ND_ARCH_VARIANT=x86_64 HOST_ARCH=x86_64 HOST_2ND_ARCH=x86 HOST_OS=linux HOST_OS_EXTRA=Linux-4.4.0-173-generic-x86_64-Ubuntu-16.04.6-LTS HOST_CROSS_OS=windows HOST_CROSS_ARCH=x86 HOST_CROSS_2ND_ARCH=x86_64 HOST_BUILD_TYPE=release BUILD_ID=PQ3B.190705.003 OUT_DIR=out ============================================ [1/1] out/soong/.minibootstrap/minibp out/soong/.bootstrap/build.ninja [55/56] glob prebuilts/ndk/stl.bp [77/77] out/soong/.bootstrap/bin/soong_build out/soong/build.ninja out/build-aosp_x86_64-cleanspec.ninja is missing, regenerating... out/build-aosp_x86_64.ninja is missing, regenerating... [25/967] including development/build/Android.mk ... development/build/build_android_stubs.mk:43: warning: android_stubs_current development/build/build_android_stubs.mk:43: warning: metalava_android_stubs_current metalava_android_stubs_current development/build/build_android_stubs.mk:43: warning: android_system_stubs_current development/build/build_android_stubs.mk:43: warning: android_test_stubs_current development/build/build_android_stubs.mk:43: warning: metalava_android_system_stubs_current metalava_android_system_stubs_current development/build/build_android_stubs.mk:43: warning: metalava_android_test_stubs_current metalava_android_test_stubs_current [567/967] including system/sepolicy/Android.mk ... system/sepolicy/Android.mk:79: warning: BOARD_SEPOLICY_VERS not specified, assuming current platform version [967/967] including tools/tradefederation/core/Android.mk ... [ 99% 1160/1161] glob vendor/google_data/pgo-profiles/art/dex2oat_x86_x86_64.profdata.* [ 1% 1888/106670] target C++: libadbd_usb <= system/core/adb/daemon/usb.cpp FAILED: out/target/product/generic_x86_64/obj/STATIC_LIBRARIES/libadbd_usb_intermediates/daemon/usb.o /bin/bash -c "PWD=/proc/self/cwd prebuilts/clang/host/linux-x86/clang-4691093/bin/clang++ -I system/core/adb -I out/target/product/generic_x86_64/obj/STATIC_LIBRARIES/libadbd_usb_intermediates -I out/target/product/generic_x86_64/gen/STATIC_LIBRARIES/libadbd_usb_intermediates -I libnativehelper/include_jni \$(cat out/target/product/generic_x86_64/obj/STATIC_LIBRARIES/libadbd_usb_intermediates/import_includes) -I system/core/include -I system/media/audio/include -I hardware/libhardware/include -I hardware/libhardware_legacy/include -I hardware/ril/include -I libnativehelper/include -I frameworks/native/include -I frameworks/native/opengl/include -I frameworks/av/include -isystem bionic/libc/include -isystem bionic/libc/kernel/uapi -isystem bionic/libc/kernel/uapi/asm-x86 -isystem bionic/libc/kernel/android/scsi -isystem bionic/libc/kernel/android/uapi -c -Werror=implicit-function-declaration -DANDROID -fmessage-length=0 -W -Wall -Wno-unused -Winit-self -Wpointer-arith -no-canonical-prefixes -DNDEBUG -UDEBUG -fno-exceptions -Wno-multichar -O2 -g -fno-strict-aliasing -fdebug-prefix-map=/proc/self/cwd= -D__compiler_offsetof=__builtin_offsetof -Werror=int-conversion -Wno-reserved-id-macro -Wno-format-pedantic -Wno-unused-command-line-argument -fcolor-diagnostics -Wno-expansion-to-defined -Wno-zero-as-null-pointer-constant -fdebug-prefix-map=\$PWD/= -ffunction-sections -fdata-sections -fno-short-enums -funwind-tables -fstack-protector-strong -Wa,--noexecstack -D_FORTIFY_SOURCE=2 -Wstrict-aliasing=2 -Werror=return-type -Werror=non-virtual-dtor -Werror=address -Werror=sequence-point -Werror=date-time -Werror=format-security -nostdlibinc -m64 -march=x86-64 -DUSE_SSSE3 -mssse3 -msse4 -msse4.1 -msse4.2 -mpopcnt -target x86_64-linux-android -Bprebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/x86_64-linux-android/bin -Wsign-promo -Wno-inconsistent-missing-override -Wno-null-dereference -D_LIBCPP_ENABLE_THREAD_SAFETY_ANNOTATIONS -Wno-thread-safety-negative -Wno-gnu-include-next -fvisibility-inlines-hidden -std=gnu++14 -fno-rtti -frtti -Wall -Wextra -Werror -Wno-unused-parameter -Wno-missing-field-initializers -Wvla -DADB_VERSION=\"\\\"28.0.0 rc1-\$(cat out/build_number.txt)\\\"\" -fvisibility=hidden -DADB_HOST=0 -fPIC -D_USING_LIBCXX -DANDROID_STRICT -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -Werror=address-of-temporary -Werror=return-type -Wno-tautological-constant-compare -Wno-null-pointer-arithmetic -Wno-enum-compare -Wno-enum-compare-switch -MD -MF out/target/product/generic_x86_64/obj/STATIC_LIBRARIES/libadbd_usb_intermediates/daemon/usb.d -o out/target/product/generic_x86_64/obj/STATIC_LIBRARIES/libadbd_usb_intermediates/daemon/usb.o system/core/adb/daemon/usb.cpp" *system/core/adb/daemon/usb.cpp:683:10: error: use of undeclared identifier 'adb_thread_create'* * if (!adb_thread_create(usb_dbc_open_thread, h)) {* * ^* 1 error generated. [ 1% 1962/106670] build out/target/common/obj/JAVA_LIBRARIES/core-oj_intermediates/annotated/timestamp WARNING: duplicate annotation of type libcore.util.NonNull WARNING: duplicate annotation of type libcore.util.NonNull Found class java.io.PrintWriter, but unable to insert @libcore.util.NonNull: @libcore.util.NonNull (nl=false) @ {GENERIC_ARRAY_LOCATION=GenericArrayLocationCriterion at outermost type, RETURN_TYPE=ReturnTypeCriterion for method: append(C)Ljava/io/Writer;, IN_METHOD=in method 'append(C)Ljava/io/Writer;', IN_CLASS=In class 'java.io.PrintWriter' (exactly)} Found class java.io.PrintWriter, but unable to insert @libcore.util.NonNull: @libcore.util.NonNull (nl=false) @ {GENERIC_ARRAY_LOCATION=GenericArrayLocationCriterion at outermost type, RETURN_TYPE=ReturnTypeCriterion for method: append(C)Ljava/lang/Appendable;, IN_METHOD=in method 'append(C)Ljava/lang/Appendable;', IN_CLASS=In class 'java.io.PrintWriter' (exactly)} Found class java.io.PrintWriter, but unable to insert @libcore.util.NonNull: @libcore.util.NonNull (nl=false) @ {GENERIC_ARRAY_LOCATION=GenericArrayLocationCriterion at outermost type, RETURN_TYPE=ReturnTypeCriterion for method: append(Ljava/lang/CharSequence;)Ljava/io/Writer;, IN_METHOD=in method 'append(Ljava/lang/CharSequence;)Ljava/io/Writer;', IN_CLASS=In class 'java.io.PrintWriter' (exactly)} Found class java.io.PrintWriter, but unable to insert @libcore.util.Nullable: @libcore.util.Nullable (nl=false) @ {GENERIC_ARRAY_LOCATION=GenericArrayLocationCriterion at outermost type, PARAM=ParamCriterion for method: append(Ljava/lang/CharSequence;) at position: 0, IN_METHOD=in method 'append(Ljava/lang/CharSequence;)Ljava/io/Writer;', IN_CLASS=In class 'java.io.PrintWriter' (exactly)} Found class java.io.PrintWriter, but unable to insert @libcore.util.NonNull: @libcore.util.NonNull (nl=false) @ {GENERIC_ARRAY_LOCATION=GenericArrayLocationCriterion at outermost type, RETURN_TYPE=ReturnTypeCriterion for method: append(Ljava/lang/CharSequence;)Ljava/lang/Appendable;, IN_METHOD=in method 'append(Ljava/lang/CharSequence;)Ljava/lang/Appendable;', IN_CLASS=In class 'java.io.PrintWriter' (exactly)} Found class java.io.PrintWriter, but unable to insert @libcore.util.Nullable: @libcore.util.Nullable (nl=false) @ {GENERIC_ARRAY_LOCATION=GenericArrayLocationCriterion at outermost type, PARAM=ParamCriterion for method: append(Ljava/lang/CharSequence;) at position: 0, IN_METHOD=in method 'append(Ljava/lang/CharSequence;)Ljava/lang/Appendable;', IN_CLASS=In class 'java.io.PrintWriter' (exactly)} Found class java.io.PrintWriter, but unable to insert @libcore.util.NonNull: @libcore.util.NonNull (nl=false) @ {GENERIC_ARRAY_LOCATION=GenericArrayLocationCriterion at outermost type, RETURN_TYPE=ReturnTypeCriterion for method: append(Ljava/lang/CharSequence;II)Ljava/io/Writer;, IN_METHOD=in method 'append(Ljava/lang/CharSequence;II)Ljava/io/Writer;', IN_CLASS=In class 'java.io.PrintWriter' (exactly)} Found class java.io.PrintWriter, but unable to insert @libcore.util.Nullable: @libcore.util.Nullable (nl=false) @ {GENERIC_ARRAY_LOCATION=GenericArrayLocationCriterion at outermost type, PARAM=ParamCriterion for method: append(Ljava/lang/CharSequence;II) at position: 0, IN_METHOD=in method 'append(Ljava/lang/CharSequence;II)Ljava/io/Writer;', IN_CLASS=In class 'java.io.PrintWriter' (exactly)} Found class java.io.PrintWriter, but unable to insert @libcore.util.NonNull: @libcore.util.NonNull (nl=false) @ {GENERIC_ARRAY_LOCATION=GenericArrayLocationCriterion at outermost type, RETURN_TYPE=ReturnTypeCriterion for method: append(Ljava/lang/CharSequence;II)Ljava/lang/Appendable;, IN_METHOD=in method 'append(Ljava/lang/CharSequence;II)Ljava/lang/Appendable;', IN_CLASS=In class 'java.io.PrintWriter' (exactly)} Found class java.io.PrintWriter, but unable to insert @libcore.util.Nullable: @libcore.util.Nullable (nl=false) @ {GENERIC_ARRAY_LOCATION=GenericArrayLocationCriterion at outermost type, PARAM=ParamCriterion for method: append(Ljava/lang/CharSequence;II) at position: 0, IN_METHOD=in method 'append(Ljava/lang/CharSequence;II)Ljava/lang/Appendable;', IN_CLASS=In class 'java.io.PrintWriter' (exactly)} Found class java.util.HashMap, but unable to insert @libcore.util.NonNull: @libcore.util.NonNull (nl=false) @ {GENERIC_ARRAY_LOCATION=GenericArrayLocationCriterion at ( [TYPE_ARGUMENT(0)] ), RETURN_TYPE=ReturnTypeCriterion for method: entrySet()Ljava/util/Set;, IN_METHOD=in method 'entrySet()Ljava/util/Set;', IN_CLASS=In class 'java.util.HashMap' (exactly)} Found class java.util.HashMap, but unable to insert @libcore.util.NullFromTypeParam: @libcore.util.NullFromTypeParam (nl=false) @ {GENERIC_ARRAY_LOCATION=GenericArrayLocationCriterion at ( [TYPE_ARGUMENT(0), TYPE_ARGUMENT(0)] ), RETURN_TYPE=ReturnTypeCriterion for method: entrySet()Ljava/util/Set;, IN_METHOD=in method 'entrySet()Ljava/util/Set;', IN_CLASS=In class 'java.util.HashMap' (exactly)} Found class java.util.HashMap, but unable to insert @libcore.util.NullFromTypeParam: @libcore.util.NullFromTypeParam (nl=false) @ {GENERIC_ARRAY_LOCATION=GenericArrayLocationCriterion at ( [TYPE_ARGUMENT(0), TYPE_ARGUMENT(1)] ), RETURN_TYPE=ReturnTypeCriterion for method: entrySet()Ljava/util/Set;, IN_METHOD=in method 'entrySet()Ljava/util/Set;', IN_CLASS=In class 'java.util.HashMap' (exactly)} [ 1% 1977/106670] target C++: libv8src <= external/v8/src/objects.cc ninja: build stopped: subcommand failed. 18:40:54 ninja failed with: exit status 1 #### failed to build some targets (02:14 (mm:ss)) #### ssriniv4@chromeserver:~/samba/android_WORKING_DIRECTORY$ many Thanks in advance, -- -- unsubscribe: [email protected] website: http://groups.google.com/group/android-porting --- You received this message because you are subscribed to the Google Groups "android-porting" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/android-porting/1d5a37d3-0656-41e3-b6e3-d987b8a39645%40googlegroups.com.
