Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aaaf1b01 authored by Yu Liu's avatar Yu Liu Committed by Gerrit Code Review
Browse files

Merge "Treat libcrypto in com.android.tethering differently"

parents ec68cf48 6b7c316c

tests/dcla_apex_comparison_test.sh

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ function compare_dcla_libs() { 
        sha="${sha% *}"

        if [ "${prev_sha}" == "" ]; then

          prev_sha="${sha}"

        elif [ "${sha}" != "${prev_sha}" ]; then

        elif [ "${sha}" != "${prev_sha}" ] && { [ "${lib}" != "libcrypto.so" ] || [ "${module}" != "com.android.tethering" ]; }; then

          echo "Test failed, ${lib} has different hash value"

          exit 1

        fi

tests/run_integration_tests.sh

+2 −2
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ TOP="$(readlink -f "$(dirname "$0")"/../../..)" 
# mock client.

"$TOP/build/soong/tests/apex_comparison_tests.sh"

"$TOP/build/soong/tests/apex_comparison_tests.sh" "module_arm64only"

#extra_build_params=--bazel-mode-staging "$TOP/build/soong/tests/dcla_apex_comparison_test.sh"

#BUILD_BROKEN_DISABLE_BAZEL=true "$TOP/build/soong/tests/dcla_apex_comparison_test.sh"

extra_build_params=--bazel-mode-staging "$TOP/build/soong/tests/dcla_apex_comparison_test.sh"

BUILD_BROKEN_DISABLE_BAZEL=true "$TOP/build/soong/tests/dcla_apex_comparison_test.sh"

"$TOP/build/soong/tests/apex_cc_module_arch_variant_tests.sh"

"$TOP/build/soong/tests/apex_cc_module_arch_variant_tests.sh" "aosp_arm" "armv7-a"

"$TOP/build/soong/tests/apex_cc_module_arch_variant_tests.sh" "aosp_cf_arm64_phone" "armv8-a" "cortex-a53"