aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Enable host xz to build the kernelHEADreplicant-11-nlnet-eu-grant-825310-replicant-updatereplicant-11Denis 'GNUtoo' Carikli2020-12-011-0/+1
| | | | | | | | | | | | | | | | | | | Without that fix we have: XZKERN arch/arm/boot/compressed/piggy_data xz: Unsupported filter chain or filter options make[3]: *** [.../kernel/replicant/linux/arch/arm/boot/compressed/Makefile:184: arch/arm/boot/compressed/piggy_data] Error 1 make[3]: *** Deleting file 'arch/arm/boot/compressed/piggy_data' make[2]: *** [.../kernel/replicant/linux/arch/arm/boot/Makefile:64: arch/arm/boot/compressed/vmlinux] Error 2 make[1]: *** [arch/arm/Makefile:328: zImage] Error 2 make[1]: Leaving directory '.../out/target/product/i9300/obj/KERNEL_OBJ' make: *** [Makefile:185: __sub-make] Error 2 Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
* Enable host perl to build the kernelDenis 'GNUtoo' Carikli2020-12-011-0/+1
| | | | | | | | | | | | | | | | | Without that fix we have: Disallowed PATH tool "perl" used: []string{"perl", ".../kernel/replicant/linux/lib/build_OID_registry", ".../kernel/replicant/linux/include/linux/oid_registry.h", "lib/oid_registry_data.c"} See https://android.googlesource.com/platform/build/+/ master/Changes.md#PATH_Tools for more information. [...] "perl" is not allowed to be used. See https://android.googlesource.com/platform/build/+/ master/Changes.md#PATH_Tools for more information. Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
* Enable host m4 to build the kernelDenis 'GNUtoo' Carikli2020-12-011-0/+1
| | | | | | | | | | | | | | | | | | | | Without that fix we have: "m4" is not allowed to be used. See https://android.googlesource.com/platform/build/+/master/ Changes.md#PATH_Tools for more information. make[2]: *** [scripts/Makefile.host:9: scripts/kconfig/lexer.lex.c] Error 141 make[2]: *** Deleting file 'scripts/kconfig/lexer.lex.c' make[2]: *** Waiting for unfinished jobs.... make[1]: *** [.../kernel/replicant/linux/Makefile:604: replicant_defconfig] Error 2 make[1]: Leaving directory '.../out/target/product/i9300/obj/KERNEL_OBJ' make: *** [Makefile:185: __sub-make] Error 2 make: Leaving directory '.../kernel/replicant/linux' Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> Change-Id: Ie2f2a98624a01e31bc1f46a3d969469f290f3230
* Enable host nprocDenis 'GNUtoo' Carikli2020-11-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | For some reasons, nproc seem to be used during the build: device/samsung/midas-common/BoardConfigCommon.mk was modified, regenerating... "nproc" is not allowed to be used. See https://android.googlesource.com/platform/build/+/ master/Changes.md#PATH_Tools for more information. Disallowed PATH tool "nproc" used: []string{"nproc", "--all"} See https://android.googlesource.com/platform/build/+/ master/Changes.md#PATH_Tools for more information. device/samsung/midas-common/BoardConfigCommon.mk was modified, regenerating... Disallowed PATH tool "nproc" used: []string{"nproc", "--all"} See https://android.googlesource.com/platform/build/+/ master/Changes.md#PATH_Tools for more information. [100% 2/2] initializing build system ... "nproc" is not allowed to be used. See https://android.googlesource.com/platform/build/+/ master/Changes.md#PATH_Tools for more information. Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
* Merge cherrypicks of [12212499, 12213565, 12213741, 12213742, 12213743, ↵android-vts-11.0_r2android-vts-11.0_r1android-security-11.0.0_r1android-platform-11.0.0_r2android-platform-11.0.0_r1android-cts-11.0_r2android-cts-11.0_r1android-11.0.0_r5android-11.0.0_r4android-11.0.0_r3android-11.0.0_r2android-11.0.0_r17android-11.0.0_r1android-build-team Robot2020-07-222-45/+65
|\ | | | | | | | | | | 12213702, 12213319, 12213491, 12213118, 12213065, 12213602, 12213603] into rvc-release Change-Id: I131b23ebe4f88331ec4992fcc27ece8a0a064851
| * apex_set is force disabled when necessaryJiyong Park2020-07-222-45/+65
|/ | | | | | | | | | | | | | | | | | | | prebuilt_apex has been disabled when the device is configured for flattened APEXes, sanitized, instrumented, or built unbundled. However, apex_set which is another type of APEX prebuilt wasn't disabled for the same conditions. This change fixes the discripency. apex_set modules are also force disabled when the prebuilts are not expected. Bug: 161316762 Bug: 160933444 Test: OVERRIDE_TARGET_FLATTEN_APEX=true m The built image has only the flattened APEXes and the device boots Merged-In: I6c90dfb28d565861a473a1bdce93269ec370601d (cherry picked from commit 10e926bc8d02ff37a631aeaea1784921e164df6f) Change-Id: I6c90dfb28d565861a473a1bdce93269ec370601d (cherry picked from commit f220db80b8fe790d23ddcd73792e23936cb5acd2)
* Snap for 6690197 from 681d4b7cf1f0195a6f1d62d55ed61a3b51a85986 to rvc-releaseandroid-build-team Robot2020-07-1810-56/+687
|\ | | | | | | Change-Id: I1970c44ce7de6683c32c394aa4d65fb4d106a6a9
| * Merge "Pass unstripped JNI libraries to Make" into rvc-devColin Cross2020-07-174-21/+56
| |\
| | * Pass unstripped JNI libraries to MakeColin Cross2020-07-174-21/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass a list of unstripped JNI libraries to Make so that they can be installed into the symbols directory. Bug: 159726429 Test: forrest Change-Id: Ieb4bffbb3d0a09f476da011399c5b8b1611929d7 Merged-In: Ieb4bffbb3d0a09f476da011399c5b8b1611929d7 (cherry picked from commit 403cc15f1b01a43902a77f9d136d96303ebbe7af)
| * | Merge changes from topic "lint-unbundled-apps" into rvc-devColin Cross2020-07-178-35/+631
| |\ \ | | |/ | |/| | | | | | | | | | | | | * changes: Build a zip of transitive lint reports for apps Add DepSets Support lint on unbundled builds
| | * Build a zip of transitive lint reports for appsColin Cross2020-07-165-27/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a rule to build a zip containing the lint reports from transitive dependencies for apps, and pass it to Make. Bug: 153485543 Test: m TARGET_BUILD_APPS=Gallery2 lint-check Change-Id: I523c09016251377ff89d76084769be7401b95425 Merged-In: I523c09016251377ff89d76084769be7401b95425 (cherry picked from commit c0efd1db13e383a0b3ac96e3718a006dea0e1cfd)
| | * Add DepSetsColin Cross2020-07-163-0/+496
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add DepSets to efficiently support tracking transitive Paths without copying, based on Bazel's depsets: https://docs.bazel.build/versions/master/skylark/depsets.html Bug: 153485543 Test: depset_test.go Change-Id: If744affdf1ed850113166ba611a79a891262040c Merged-In: If744affdf1ed850113166ba611a79a891262040c (cherry picked from commit 9e44e21e91cf38aa0a863bd87cffa6fe3534cc04)
| | * Support lint on unbundled buildsColin Cross2020-07-161-8/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use prebuilts of the annotations.zip and api-versions.xml files when running lint in an unbundled build. Bug: 153485543 Test: m TARGET_BUILD_APPS=Gallery2 lint-check Change-Id: Idacf3758a2769678a635941486183673e95b43f8 Merged-In: Idacf3758a2769678a635941486183673e95b43f8 (cherry picked from commit 8a6ed3750df5ce7fb4a8f2b1b623bfa1071449cb)
* | | Snap for 6680390 from 774a7580267ec9cb898f2a64b659fd85b7209926 to rvc-releaseandroid-build-team Robot2020-07-153-3/+3
|\| | | | | | | | | | | Change-Id: I9a65e6c29391e67255bd2295d1d59595070d7b28
| * | Use unzip -DDColin Cross2020-07-133-3/+3
| |/ | | | | | | | | | | | | | | | | | | | | | | | | We put reproducible timestamps in zip files so that the artifacts are consistent, but that leads to old timestamps in the output directory if they are unzipped as part of the build. Use unzip -DD when unzipping to update the timestamps. Bug: 161015009 Test: touch -d 2020-01-01 ref; find $OUT/system -not -newer ref Change-Id: I70407a627cb070e24be510faa6a774e3d9eae3a8 Merged-In: I70407a627cb070e24be510faa6a774e3d9eae3a8 (cherry picked from commit d783bbbace0d7e5b7e333ffa276ff18216109cc7)
* | Snap for 6671561 from 7e2b36c7d59b1939d3ff1be79bd846a882e75bf7 to rvc-releaseandroid-build-team Robot2020-07-112-0/+5
|\| | | | | | | Change-Id: I549ea712b591e7eb6e25e5b0e872ba5831e92e5e
| * Set LOCAL_APKCERTS_FILE for apk_set modules in apexesColin Cross2020-07-092-0/+5
| | | | | | | | | | | | | | | | | | | | I321e80fd636a955213761f56a3ac64bfe7f7f7c0 missed setting LOCAL_APKCERTS_FILE for apk_set modules in apexes, which causes invalid apkcerts.txt files. Bug: 160652723 Test: m apkcerts-list Change-Id: I1ccaafd04978374d0da10363a1d782cfeae428e7
* | Snap for 6664334 from 03f3a9c1466f85105d3eba813a2b3ebbb96b402f to rvc-releaseandroid-build-team Robot2020-07-096-4/+43
|\| | | | | | | Change-Id: Ie5982bea4746d672269d2a4cf91b17467c64f8b0
| * Use a default exclude filter for JaCoCo in Soong.Chris Gross2020-07-084-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instrumented builds should exclude certain classes from instrumenation by default. (e.g. JaCoCo itself) Leverage the existing DefaultJacocoExclusionFilter to do this. Note: Two different default filters exist now (one for Make and one for Soong), as they have different wildcard rules. Test: EMMA_INSTRUMENT=true EMMA_INSTRUMENT_STATIC=true m -j32 TeleService and inspected the resulting temporary jar that was instrumented to confirm that anything from org/jacoco was excluded. Bug: 159748844 Change-Id: I5466b0a03957edfbe53971d5d1a7729fdb8337db Merged-In: I5466b0a03957edfbe53971d5d1a7729fdb8337db
| * Add soong cc and java deps to general-tests distLiz Kammer2020-07-072-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | Test: m SOONG_COLLECT_CC_DEPS=true SOONG_COLLECT_JAVA_DEPS=true dist general-tests and verify module_bp_java_deps.json and module_bp_cc_deps.json is in out/dist Test: m SOONG_COLLECT_CC_DEPS=true SOONG_COLLECT_JAVA_DEPS=true checkbuild dist general-tests Bug: 154845369 Merged-In: I683fe1d7e17f7abaab40206770d09db705493ffb Change-Id: I683fe1d7e17f7abaab40206770d09db705493ffb
* | Snap for 6657150 from 1b7fc95d68e1a82a0119686fd3a6e311f84960a1 to rvc-releaseandroid-build-team Robot2020-07-079-49/+120
|\| | | | | | | Change-Id: I74d908f313ea9b8837e9a6a6aad1bce8ac3ffccc
| * Merge "Add sandbox property to the javadoc rule." into rvc-devRamy Medhat2020-07-062-30/+57
| |\
| | * Add sandbox property to the javadoc rule.Ramy Medhat2020-07-062-30/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The sandbox property indicates whether metalava should only read inputs explicitly specified on the command line. This CL adds the property and sets the appropriate configuration for RBE depending on whether the sandbox is set or not. Bug: b/156613606 Test: built aosp_crosshatch-userdebug with/without RBE_METALAVA. Change-Id: I7256d29f18e0af18dbe65d1c7dbbf62fd3d65f4c Merged-In: I7256d29f18e0af18dbe65d1c7dbbf62fd3d65f4c
| * | Merge changes from topic "gcov-clang-migration" into rvc-devOliver Nguyen2020-07-067-19/+63
| |\ \ | | |/ | |/| | | | | | | | | | | | | * changes: Make native_coverage clause work with ClangCoverage Introduce product variables to select Java code coverage paths in Soong. Rename native code coverage paths product variables in Soong.
| | * Make native_coverage clause work with ClangCoverageColin Cross2020-07-026-11/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make uses NATIVE_COVERAGE to enable gcov coverage and CLANG_COVERAGE to enable clang coverage. NATIVE_COVERAGE is translated to the Soong Native_coverage product variable which triggers the native_coverage clause in Android.bp files. The clause also needs to be triggered for CLANG_COVERAGE. Rename the existing Native_coverage product variable to GcovCoverage, and regenerate Native_coverage when either GcovCoverage or ClangCoverage are set. Also remove NativeLineCoverage, it wasn't doing anything differently than Native_coverage. Bug: 159059537 Test: m checkbuild Merged-In: I215124a9b35a2ad50ad562079d392e3d33da11f4 Change-Id: I215124a9b35a2ad50ad562079d392e3d33da11f4
| | * Introduce product variables to select Java code coverage paths in Soong.Roland Levillain2020-06-303-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce product variables `JavaCoveragePaths` and `JavaCoverageExcludePaths` (resp. populated from environment variables `JAVA_COVERAGE_PATHS` and `JAVA_COVERAGE_EXCLUDE_PATHS`). Use them to control which Java modules are candidate for instrumentation based on their source path. By default (when `JavaCoveragePaths` is empty), have all Java module be candidate for instrumentation, to preserve the existing behavior. Test: export EMMA_INSTRUMENT=true \ && export EMMA_INSTRUMENT_FRAMEWORK=true \ && export JAVA_COVERAGE_PATHS=art \ && m Bug: 158212027 Bug: 156284897 Merged-In: Ibe9c1f41ed6110867411952689c5a7ad6536f277 Change-Id: Ibe9c1f41ed6110867411952689c5a7ad6536f277
| | * Rename native code coverage paths product variables in Soong.Roland Levillain2020-06-303-11/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename `CoveragePath` and `CoverageExcludePaths` as `NativeCoveragePath` and `NativeCoverageExcludePaths` (resp.). Also rename function `android.CoverageEnabledForPath` as `android.NativeCoverageEnabledForPath`. Test: m nothing Bug: 158212027 Merged-In: Id2c11a638e88088096420b537effa866d7667304 Change-Id: Id2c11a638e88088096420b537effa866d7667304
* | | Snap for 6647388 from f221e59429f5f68fc26e3653677ec61967af6ecd to rvc-releaseandroid-build-team Robot2020-07-028-31/+123
|\| | | | | | | | | | | Change-Id: I43e90572c76464e3cb932132572da70c2b424bab
| * | Merge "DO NOT MERGE apex: install flattened from apex_set" into rvc-devJooyung Han2020-07-011-5/+31
| |\ \
| | * | DO NOT MERGE apex: install flattened from apex_setJooyung Han2020-06-301-5/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | apex_set is a set of prebuilt apex files. To support GSI which installs both flattened and unflattened APEXes when apex_set is used, we extract the contents from the selected APEX file. Bug: 159711661 Test: TARGET_PRODUCT=gsi_gms_arm64 m should install flattened apexes in /system/system_ext/apex Change-Id: I0a51b9f4a4537d3230aaa3eece532664ea18bc7c
| * | | Merge "Include shared lib in vendor snapshot if isVndkExt" into rvc-devInseob Kim2020-07-011-2/+17
| |\ \ \
| | * | | Include shared lib in vendor snapshot if isVndkExtBill Peckham2020-06-301-2/+17
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A VDNK extension is an image:vendor module provided by a vendor-modified framework project. So it should be provided to the vendor build as a prebuilt (for the purposes of building against a vendor snapshot). Bug: 160189878 Test: manual Change-Id: I3eb4794c1be2949b9c85fd52f823e5e14df4ad7d
| * | | Merge "Output apkcerts file for android_app_set." into rvc-devJaewoong Jung2020-07-016-24/+75
| |\ \ \
| | * | | Output apkcerts file for android_app_set.Jaewoong Jung2020-06-306-24/+75
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Soong and Make have no ways to figure out what splits will be outputted from a given android_app_set, so it's impossible for them to provide full PACKAGES.$(LOCAL_MODULE).CERTIFICATE entries, which are required to build a final apkcerts.txt. This change makes extract_apks produce apkcerts.txt files for each input modules instead. The Make-side counterpart of this change merges all local apkcerts.txt into a final one. Fixes: 160119159 Test: main_test.go Test: m apkcerts-list Change-Id: I321e80fd636a955213761f56a3ac64bfe7f7f7c0
* | | | Snap for 6643631 from ff1531e13b49792cb776c6d3374435d7fe4d7006 to rvc-releaseandroid-build-team Robot2020-07-013-0/+8
|\| | | | | | | | | | | | | | | Change-Id: I445c6fd80b19c11693027f9a14152048ee422bec
| * | | Merge "Propagate owner property for apex modules" into rvc-devAnton Hansson2020-06-302-0/+4
| |\ \ \
| | * | | Propagate owner property for apex modulesAnton Hansson2020-06-302-0/+4
| | |/ / | | | | | | | | | | | | | | | | | | | | Bug: 160165426 Test: lunch aosp_taimen && m nothing Change-Id: I1d274ea376c58ff44d69ef5440c919b67079ae4a
| * | | Merge "[HWASan] Disable GlobalISel/FastISel w/ HWASan." into rvc-devMitch Phillips2020-06-301-0/+4
| |\ \ \ | | |/ / | |/| |
| | * | [HWASan] Disable GlobalISel/FastISel w/ HWASan.Mitch Phillips2020-06-301-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 159343917 Test: See upstream testing at https://reviews.llvm.org/D82249 Change-Id: Ib644a857caa048d7fc3dd5e5f20553e0b4a47d43
* | | | Snap for 6634012 from c4422106a7cf4731e27d664646bc0d57ad3f37fa to rvc-releaseandroid-build-team Robot2020-06-273-7/+33
|\| | | | | | | | | | | | | | | Change-Id: Idfd3a3487b11fdc16265d015d34aa79237cab6e8
| * | | Apply hiddenapi encoding to java_sdk_library .implPaul Duffin2020-06-263-7/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a ConfigurationName property, and ConfigurationName() method that allows a library to separate its name (e.g. framework-tethering.impl) from the name used in the build configuration, e.g. ctx.Config().BootJars(). Updates hiddenapi processing to use ConfigurationName() instead of ctx.ModuleName(). Changes java_sdk_library to set the ConfigurationName property of the implementation library to the name of the module instead of <module>.impl so that it will match the name in the boot jars list. Bug: 159683330 Test: m framework-tethering dexdump ${PRODUCT_OUT}/apex/com.android.tethering/javalib/framework-tethering.jar | grep hiddenapi | wc -l Verify that there are >0 hiddenapi entries. Add java_sdk_library_import prefer=true for framework-tethering and repeat the above to verify that there are 0 hiddenapi entries. Apply this change, repeat above and verify that there are the same # of entries as before. Remove the prebuilt for framework-tethering Repeat the above and verify that there is no change to the # of entries Change-Id: I6c3016c35d0fcb1b95d4f9b37a307a69878f8e0a
* | | | Snap for 6630229 from 82f62fdac4ccb234585751b3631567226e8f5c58 to rvc-releaseandroid-build-team Robot2020-06-261-1/+6
|\| | | | | | | | | | | | | | | Change-Id: Id483326e6d20f4886e6ce0cd938f5500da68a250
| * | | Merge "Add exclude_shared_libs, expand exclude_static_libs to cover ↵Victor Khimenko2020-06-251-1/+6
| |\ \ \ | | |_|/ | |/| | | | | | static_libs" into rvc-dev
| | * | Add exclude_shared_libs, expand exclude_static_libs to cover static_libsColin Cross2020-06-241-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow variants to exclude shared or static libs. Bug: 153609531 Test: manual Change-Id: I6ac9c445ed233c774a051743ed6760058c9918e9
* | | | Snap for 6626121 from 16e8b0492d25772c5fdae76265a1830c147dcf2e to rvc-releaseandroid-build-team Robot2020-06-252-8/+17
|\| | | | | | | | | | | | | | | Change-Id: I92bdb3bcef7a1036cae2d480f9971011364597eb
| * | | Merge changes Ie163a4da,I16375b88 into rvc-devColin Cross2020-06-242-8/+17
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Set root dir in lint project.xml Set ANDROID_SDK_HOME when running lint
| | * | | Set root dir in lint project.xmlColin Cross2020-06-232-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the root dir in the project.xml for lint so that the paths in the lint report are relative to the top of the tree instead of relative to the project.xml. Bug: 153485543 Test: run lint Change-Id: Ie163a4dadd976e708f798855de73e58084931a91 Merged-In: Ie163a4dadd976e708f798855de73e58084931a91 (cherry picked from commit c31efeb25cac61fd3c2af3fed5bedeca2d401994)
| | * | | Set ANDROID_SDK_HOME when running lintColin Cross2020-06-231-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lint tries to create ~/.android, set ANDROID_SDK_HOME to keep it from attempting to write to the home directory, which may not be writable. Test: run lint Bug: 159676171 Change-Id: I16375b88d309a8fa416b3a8efeabe15759889ae3 Merged-In: I16375b88d309a8fa416b3a8efeabe15759889ae3 (cherry picked from commit 977b6a822d4239c6af060340c1670582c6af647d)
* | | | | Snap for 6621766 from 433ea2321a175260969d757bc8e90547466c30d0 to rvc-releaseandroid-build-team Robot2020-06-245-18/+78
|\| | | | | | | | | | | | | | | | | | | Change-Id: I2abf1ff917de9918e971ba0cf231b0a40f4a6b57
| * | | | Change how override_modules work with prebuilts.Jaewoong Jung2020-06-231-6/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an override module is overridden by a prebuilt, only skip its installation instead of completely ignoring it, so that other modules rely on it can still get configured and built properly. Fixes: 159694118 Test: m checkbuild Change-Id: I96d24f1440ff8a8aa8b1253fc22fd532b5588339