From b693be549eb0f2f113ec8cdff3c50e9336b57c7e Mon Sep 17 00:00:00 2001 From: Kevin May Date: Fri, 10 Jun 2022 12:41:40 +0100 Subject: IVGCVSW-6966 Add build folder vars for SL build process * Use cmake flags to indicate armnn build and aosp modules folders Signed-off-by: Kevin May Change-Id: I8afa94734823ba3f855941d4462be45677d41f46 --- shim/BuildGuideShimSupportLibrary.md | 70 ++-- shim/sl/CMakeLists.txt | 784 ++++++++++++++++++----------------- shim/sl/scripts/clone_aosp_libs.sh | 65 +-- shim/sl/scripts/modify_aosp_libs.sh | 28 +- 4 files changed, 493 insertions(+), 454 deletions(-) diff --git a/shim/BuildGuideShimSupportLibrary.md b/shim/BuildGuideShimSupportLibrary.md index 550a05f70f..dc69f8f77c 100644 --- a/shim/BuildGuideShimSupportLibrary.md +++ b/shim/BuildGuideShimSupportLibrary.md @@ -15,11 +15,13 @@ This work is currently in an experimental phase. ## Prerequisites -The following are required to build the support library +The following are required to build the Arm NN support library * Android NDK r20b * Detailed setup can be found in [BuildGuideAndroidNDK.md](../BuildGuideAndroidNDK.md) * Flatbuffer version 1.12.0 * Detailed setup can be found in [BuildGuideCrossCompilation.md](../BuildGuideCrossCompilation.md) + +The following is required to build the Arm NN shim * AOSP Source (Android Open Source Project) * Download the source from the [official website](https://source.android.com/setup/build/downloading) * This guide will use release tag `android12-s1-release` @@ -27,21 +29,29 @@ The following are required to build the support library Set environment variables ```bash -export AOSP_ROOT= -export NDK=/android-ndk-r20b +export WORKING_DIR= +export AOSP_ROOT= +export AOSP_MODULES_ROOT= +export ARMNN_BUILD_DIR= +export NDK=android-ndk-r20b export NDK_TOOLCHAIN_ROOT=$NDK/toolchains/llvm/prebuilt/linux-x86_64 export PATH=$NDK_TOOLCHAIN_ROOT/bin/:$PATH -export FLATBUFFERS_ANDROID_BUILD= -export FLATBUFFERS_X86_BUILD= +export FLATBUFFERS_ANDROID_BUILD= +export FLATBUFFERS_X86_BUILD= ``` ## Download Arm NN -* Clone Arm NN into the AOSP tree: +If the user only wishes to build the Support Library with the NDK, the Arm NN repo can be cloned into any folder. +If the user also wishes to build the Arm NN Shim, for this the Arm NN repo will need to reside within +the Android tree in order for armnn/shim/Android.bp to be picked up by the Soong (Android) build system. +For example $AOSP_ROOT/vendor/arm/armnn + + +* Clone Arm NN: (Requires Git if not previously installed: `sudo apt install git`) ```bash -mkdir -p $AOSP_ROOT/vendor/arm/ -cd $AOSP_ROOT/vendor/arm/ +cd $WORKING_DIR git clone https://github.com/ARM-software/armnn.git ``` @@ -49,12 +59,12 @@ git clone https://github.com/ARM-software/armnn.git Arm NN provides a script that downloads the version of Arm Compute Library that Arm NN was tested with: ```bash -./armnn/scripts/get_compute_library.sh +${WORKING_DIR}/armnn/scripts/get_compute_library.sh ``` -* Build the Arm Compute Library: +* Build the Arm Compute Library: (Requires SCons if not previously installed: `sudo apt install scons`) ```bash -cd $AOSP_ROOT/vendor/arm/clframework +cd ${WORKING_DIR}/clframework scons arch=arm64-v8a \ toolchain_prefix=aarch64-linux-android- \ @@ -69,21 +79,20 @@ validation_tests=0 benchmark_tests=0 benchmark_examples=0 os=android -j16 ## Build Arm NN and Serializer -* Build Arm NN: +* Build Arm NN: (Requires CMake if not previously installed: `sudo apt install cmake`) ```bash -mkdir -p $AOSP_ROOT/vendor/arm/armnn/build -cd $AOSP_ROOT/vendor/arm/armnn/build +cd $ARMNN_BUILD_DIR CXX=aarch64-linux-android29-clang++ \ CC=aarch64-linux-android29-clang \ -CXX_FLAGS="-fPIE -fPIC" cmake .. \ +CXX_FLAGS="-fPIE -fPIC" cmake ${WORKING_DIR}/armnn \ -DCMAKE_ANDROID_NDK=$NDK \ -DCMAKE_SYSTEM_NAME=Android \ -DCMAKE_SYSTEM_VERSION=29 \ -DCMAKE_ANDROID_ARCH_ABI=arm64-v8a \ -DCMAKE_EXE_LINKER_FLAGS="-pie -llog -lz" \ --DARMCOMPUTE_ROOT=$AOSP_ROOT/vendor/arm/clframework/ \ --DARMCOMPUTE_BUILD_DIR=$AOSP_ROOT/vendor/arm/clframework/build/android-arm64v8a/ \ +-DARMCOMPUTE_ROOT=$WORKING_DIR/clframework/ \ +-DARMCOMPUTE_BUILD_DIR=$WORKING_DIR/clframework/build/android-arm64v8a/ \ -DARMCOMPUTENEON=1 -DARMCOMPUTECL=1 -DARMNNREF=1 \ -DFLATBUFFERS_ROOT=$FLATBUFFERS_ANDROID_BUILD \ -DFLATC_DIR=$FLATBUFFERS_X86_BUILD \ @@ -98,15 +107,17 @@ make -j16 ## Build Arm NN Support Library Building the support library requires building some AOSP libraries via the NDK. -It should be possible to create a symlink from $AOSP_ROOT to $AOSP_ROOT/vendor/arm/armnn/sl/aosp. -However this example will instead clone the necessary AOSP repos and apply some minor patches which were required to get it to build. +It should be possible to use $AOSP_ROOT instead of $AOSP_MODULES_ROOT. + +However this example will instead clone the necessary AOSP repos outside of the Android tree and apply some minor patches +which were required to get it to build with the Android version used in this guide. + ```bash -cd $AOSP_ROOT/vendor/arm/armnn/shim/sl/ -# Call a script which will clone the necessary AOSP repos -./scripts/clone_aosp_libs.sh +# Call a script which will clone the necessary AOSP repos (do not clone them into Android tree) +${WORKING_DIR}/armnn/shim/sl/scripts/clone_aosp_libs.sh $AOSP_MODULES_ROOT -# Modify the repos by applying patches and 'switching off' Android.bp/.mk files by renaming them -./scripts/modify_aosp_libs.sh +# Modify the repos by applying patches +${WORKING_DIR}/armnn/shim/sl/scripts/modify_aosp_libs.sh $AOSP_MODULES_ROOT # Build the Support Library CMARGS="$CMARGS \ @@ -115,10 +126,12 @@ CMARGS="$CMARGS \ -DCMAKE_ANDROID_ARCH_ABI=arm64-v8a \ -DCMAKE_ANDROID_NDK=$NDK \ -DANDROID_PLATFORM=android-29 \ --DARMNN_SOURCE_DIR=$AOSP_ROOT/vendor/arm/armnn/ " +-DAOSP_MODULES_ROOT=$AOSP_MODULES_ROOT \ +-DARMNN_SOURCE_DIR=$WORKING_DIR/armnn \ +-DArmnn_DIR=$ARMNN_BUILD_DIR " -mkdir build -cd build +mkdir ${WORKING_DIR}/armnn/shim/sl/build +cd ${WORKING_DIR}/armnn/shim/sl/build CXX=aarch64-linux-android29-clang++ \ CC=aarch64-linux-android29-clang \ @@ -146,5 +159,4 @@ $AOSP_ROOT/out/target/product//vendor/bin/hw/android.hardware.neuralnetw $AOSP_ROOT/out/target/product//vendor/etc/vintf/manifest/android.hardware.neuralnetworks-shim-service-armnn.xml Currently the Arm NN libraries are shared libraries and therefore will need to be pushed to the device: -$AOSP_ROOT/vendor/arm/armnn/build/libarmnnSerializer.so -$AOSP_ROOT/vendor/arm/armnn/build/libarmnn.so +$ARMNN_BUILD_DIR/libarmnn.so diff --git a/shim/sl/CMakeLists.txt b/shim/sl/CMakeLists.txt index 97c544c1b9..eb16396ac6 100644 --- a/shim/sl/CMakeLists.txt +++ b/shim/sl/CMakeLists.txt @@ -11,64 +11,62 @@ include(GNUInstallDirs) SET(libnnapi_support_include_directories) list(APPEND libnnapi_support_include_directories - aosp/packages/modules/NeuralNetworks/common/types/include/nnapi/ - aosp/packages/modules/NeuralNetworks/common/types/include/ - aosp/packages/modules/NeuralNetworks/common/operations/ - aosp/packages/modules/NeuralNetworks/common/include - aosp/packages/modules/NeuralNetworks/runtime/include - aosp/packages/modules/NeuralNetworks/shim_and_sl/public - aosp/system/logging/liblog/include - aosp/system/libbase/include - aosp/frameworks/native/libs/nativewindow/include - aosp/system/core/libcutils/include - aosp/system/core/include - aosp/external/tensorflow - aosp/external/gemmlowp/ - aosp/external/ruy/ - aosp/external/eigen/ - aosp/external/boringssl/src/include - aosp/external/boringssl/include) + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/types/include/nnapi/ + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/types/include/ + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/operations/ + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/include + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/runtime/include + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/shim_and_sl/public + ${AOSP_MODULES_ROOT}/system/logging/liblog/include + ${AOSP_MODULES_ROOT}/system/libbase/include + ${AOSP_MODULES_ROOT}/frameworks/native/libs/nativewindow/include + ${AOSP_MODULES_ROOT}/system/core/libcutils/include + ${AOSP_MODULES_ROOT}/system/core/include + ${AOSP_MODULES_ROOT}/external/tensorflow + ${AOSP_MODULES_ROOT}/external/gemmlowp/ + ${AOSP_MODULES_ROOT}/external/ruy/ + ${AOSP_MODULES_ROOT}/external/eigen/ + ${AOSP_MODULES_ROOT}/external/boringssl/src/include + ${AOSP_MODULES_ROOT}/external/boringssl/include) include_directories(${libnnapi_support_include_directories}) -link_directories( ${ARMNN_SOURCE_DIR}/shim/sl/build ) - set(base_sources) list(APPEND base_sources - aosp/system/libbase/abi_compatibility.cpp - aosp/system/libbase/posix_strerror_r.cpp - aosp/system/libbase/chrono_utils.cpp - aosp/system/libbase/cmsg.cpp - aosp/system/libbase/file.cpp - aosp/system/libbase/hex.cpp - aosp/system/libbase/logging.cpp - aosp/system/libbase/mapped_file.cpp - aosp/system/libbase/parsebool.cpp - aosp/system/libbase/parsenetaddress.cpp - aosp/system/libbase/process.cpp - aosp/system/libbase/properties.cpp - aosp/system/libbase/stringprintf.cpp - aosp/system/libbase/strings.cpp - aosp/system/libbase/test_utils.cpp - aosp/system/libbase/threads.cpp) + ${AOSP_MODULES_ROOT}/system/libbase/abi_compatibility.cpp + ${AOSP_MODULES_ROOT}/system/libbase/posix_strerror_r.cpp + ${AOSP_MODULES_ROOT}/system/libbase/chrono_utils.cpp + ${AOSP_MODULES_ROOT}/system/libbase/cmsg.cpp + ${AOSP_MODULES_ROOT}/system/libbase/file.cpp + ${AOSP_MODULES_ROOT}/system/libbase/hex.cpp + ${AOSP_MODULES_ROOT}/system/libbase/logging.cpp + ${AOSP_MODULES_ROOT}/system/libbase/mapped_file.cpp + ${AOSP_MODULES_ROOT}/system/libbase/parsebool.cpp + ${AOSP_MODULES_ROOT}/system/libbase/parsenetaddress.cpp + ${AOSP_MODULES_ROOT}/system/libbase/process.cpp + ${AOSP_MODULES_ROOT}/system/libbase/properties.cpp + ${AOSP_MODULES_ROOT}/system/libbase/stringprintf.cpp + ${AOSP_MODULES_ROOT}/system/libbase/strings.cpp + ${AOSP_MODULES_ROOT}/system/libbase/test_utils.cpp + ${AOSP_MODULES_ROOT}/system/libbase/threads.cpp) add_library(base STATIC ${base_sources}) target_include_directories (base PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories (base PUBLIC ${libnnapi_support_include_directories}) file(GLOB TYPES_CL_SOURCE_FILES - aosp/packages/modules/NeuralNetworks/common/operations/*Validation.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/operations/*Validation.cpp ) set(neuralnetworks_types_cl_sources) list(APPEND neuralnetworks_types_cl_sources - aosp/packages/modules/NeuralNetworks/common/types/src/DynamicCLDeps.cpp - aosp/packages/modules/NeuralNetworks/common/types/src/SharedMemory.cpp - aosp/packages/modules/NeuralNetworks/common/types/src/SharedMemoryAndroid.cpp - aosp/packages/modules/NeuralNetworks/common/types/src/TypeUtils.cpp - aosp/packages/modules/NeuralNetworks/common/types/src/OperationsValidationUtils.cpp - aosp/packages/modules/NeuralNetworks/common/types/src/Types.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/types/src/DynamicCLDeps.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/types/src/SharedMemory.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/types/src/SharedMemoryAndroid.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/types/src/TypeUtils.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/types/src/OperationsValidationUtils.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/types/src/Types.cpp ${TYPES_CL_SOURCE_FILES} - aosp/packages/modules/NeuralNetworks/common/types/src/Validation.cpp) + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/types/src/Validation.cpp) add_library(neuralnetworks_types_cl STATIC ${neuralnetworks_types_cl_sources}) target_include_directories (neuralnetworks_types_cl PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) @@ -76,64 +74,64 @@ target_include_directories (neuralnetworks_types_cl PUBLIC ${libnnapi_support_in set(neuralnetworks_common_cl_sources) list(APPEND neuralnetworks_common_cl_sources - aosp/packages/modules/NeuralNetworks/common/BufferTracker.cpp - aosp/packages/modules/NeuralNetworks/common/CpuExecutor.cpp - aosp/packages/modules/NeuralNetworks/common/GraphDump.cpp - aosp/packages/modules/NeuralNetworks/common/IndexedShapeWrapper.cpp - aosp/packages/modules/NeuralNetworks/common/LegacyUtils.cpp - aosp/packages/modules/NeuralNetworks/common/ModelUtils.cpp - aosp/packages/modules/NeuralNetworks/common/MetaModel.cpp - aosp/packages/modules/NeuralNetworks/common/OperationsExecutionUtils.cpp - aosp/packages/modules/NeuralNetworks/common/types/src/OperationsUtils.cpp - aosp/packages/modules/NeuralNetworks/common/TokenHasher.cpp - aosp/packages/modules/NeuralNetworks/common/OperationResolver.cpp - aosp/packages/modules/NeuralNetworks/common/operations/ActivationExecution.cpp - aosp/packages/modules/NeuralNetworks/common/operations/BatchMatmulExecution.cpp - aosp/packages/modules/NeuralNetworks/common/operations/BidirectionalSequenceRNNExecution.cpp - aosp/packages/modules/NeuralNetworks/common/operations/BroadcastExecution.cpp - aosp/packages/modules/NeuralNetworks/common/operations/ChannelShuffleExecution.cpp - aosp/packages/modules/NeuralNetworks/common/operations/ComparisonsExecution.cpp - aosp/packages/modules/NeuralNetworks/common/operations/ConcatenationExecution.cpp - aosp/packages/modules/NeuralNetworks/common/operations/Conv2DExecution.cpp - aosp/packages/modules/NeuralNetworks/common/operations/DepthwiseConv2DExecution.cpp - aosp/packages/modules/NeuralNetworks/common/operations/DequantizeExecution.cpp - aosp/packages/modules/NeuralNetworks/common/operations/ElementwiseExecution.cpp - aosp/packages/modules/NeuralNetworks/common/operations/EluExecution.cpp - aosp/packages/modules/NeuralNetworks/common/operations/FillExecution.cpp - aosp/packages/modules/NeuralNetworks/common/operations/FullyConnectedExecution.cpp - aosp/packages/modules/NeuralNetworks/common/operations/GatherExecution.cpp - aosp/packages/modules/NeuralNetworks/common/operations/GenerateProposalsExecution.cpp - aosp/packages/modules/NeuralNetworks/common/operations/HeatmapMaxKeypointExecution.cpp - aosp/packages/modules/NeuralNetworks/common/operations/InstanceNormalizationExecution.cpp - aosp/packages/modules/NeuralNetworks/common/operations/L2NormalizationExecution.cpp - aosp/packages/modules/NeuralNetworks/common/operations/LocalResponseNormalizationExecution.cpp - aosp/packages/modules/NeuralNetworks/common/operations/LogSoftmaxExecution.cpp - aosp/packages/modules/NeuralNetworks/common/operations/LogicalAndOrExecution.cpp - aosp/packages/modules/NeuralNetworks/common/operations/LogicalNotExecution.cpp - aosp/packages/modules/NeuralNetworks/common/operations/MirrorPadExecution.cpp - aosp/packages/modules/NeuralNetworks/common/operations/NegExecution.cpp - aosp/packages/modules/NeuralNetworks/common/operations/PackExecution.cpp - aosp/packages/modules/NeuralNetworks/common/operations/PReluExecution.cpp - aosp/packages/modules/NeuralNetworks/common/operations/PoolingExecution.cpp - aosp/packages/modules/NeuralNetworks/common/operations/QLSTMExecution.cpp - aosp/packages/modules/NeuralNetworks/common/operations/QuantizeExecution.cpp - aosp/packages/modules/NeuralNetworks/common/operations/RankExecution.cpp - aosp/packages/modules/NeuralNetworks/common/operations/ReduceExecution.cpp - aosp/packages/modules/NeuralNetworks/common/operations/ReshapeExecution.cpp - aosp/packages/modules/NeuralNetworks/common/operations/ReverseExecution.cpp - aosp/packages/modules/NeuralNetworks/common/operations/ResizeImageOpsExecution.cpp - aosp/packages/modules/NeuralNetworks/common/operations/RoiAlignExecution.cpp - aosp/packages/modules/NeuralNetworks/common/operations/RoiPoolingExecution.cpp - aosp/packages/modules/NeuralNetworks/common/operations/SelectExecution.cpp - aosp/packages/modules/NeuralNetworks/common/operations/SliceExecution.cpp - aosp/packages/modules/NeuralNetworks/common/operations/SoftmaxExecution.cpp - aosp/packages/modules/NeuralNetworks/common/operations/SqueezeExecution.cpp - aosp/packages/modules/NeuralNetworks/common/operations/StridedSliceExecution.cpp - aosp/packages/modules/NeuralNetworks/common/operations/TopK_V2Execution.cpp - aosp/packages/modules/NeuralNetworks/common/operations/TransposeExecution.cpp - aosp/packages/modules/NeuralNetworks/common/operations/TransposeConv2DExecution.cpp - aosp/packages/modules/NeuralNetworks/common/operations/UnidirectionalSequenceLSTMExecution.cpp - aosp/packages/modules/NeuralNetworks/common/operations/UnidirectionalSequenceRNNExecution.cpp) + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/BufferTracker.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/CpuExecutor.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/GraphDump.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/IndexedShapeWrapper.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/LegacyUtils.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/ModelUtils.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/MetaModel.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/OperationsExecutionUtils.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/types/src/OperationsUtils.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/TokenHasher.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/OperationResolver.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/operations/ActivationExecution.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/operations/BatchMatmulExecution.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/operations/BidirectionalSequenceRNNExecution.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/operations/BroadcastExecution.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/operations/ChannelShuffleExecution.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/operations/ComparisonsExecution.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/operations/ConcatenationExecution.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/operations/Conv2DExecution.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/operations/DepthwiseConv2DExecution.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/operations/DequantizeExecution.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/operations/ElementwiseExecution.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/operations/EluExecution.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/operations/FillExecution.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/operations/FullyConnectedExecution.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/operations/GatherExecution.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/operations/GenerateProposalsExecution.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/operations/HeatmapMaxKeypointExecution.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/operations/InstanceNormalizationExecution.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/operations/L2NormalizationExecution.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/operations/LocalResponseNormalizationExecution.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/operations/LogSoftmaxExecution.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/operations/LogicalAndOrExecution.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/operations/LogicalNotExecution.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/operations/MirrorPadExecution.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/operations/NegExecution.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/operations/PackExecution.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/operations/PReluExecution.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/operations/PoolingExecution.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/operations/QLSTMExecution.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/operations/QuantizeExecution.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/operations/RankExecution.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/operations/ReduceExecution.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/operations/ReshapeExecution.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/operations/ReverseExecution.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/operations/ResizeImageOpsExecution.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/operations/RoiAlignExecution.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/operations/RoiPoolingExecution.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/operations/SelectExecution.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/operations/SliceExecution.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/operations/SoftmaxExecution.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/operations/SqueezeExecution.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/operations/StridedSliceExecution.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/operations/TopK_V2Execution.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/operations/TransposeExecution.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/operations/TransposeConv2DExecution.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/operations/UnidirectionalSequenceLSTMExecution.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/common/operations/UnidirectionalSequenceRNNExecution.cpp) add_library(neuralnetworks_common_cl STATIC ${neuralnetworks_common_cl_sources}) target_include_directories (neuralnetworks_common_cl PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) @@ -141,21 +139,21 @@ target_include_directories (neuralnetworks_common_cl PUBLIC ${libnnapi_support_i set(neuralnetworks_cl_sources) list(APPEND neuralnetworks_cl_sources - aosp/packages/modules/NeuralNetworks/runtime/BurstBuilder.cpp - aosp/packages/modules/NeuralNetworks/runtime/CompilationBuilder.cpp - aosp/packages/modules/NeuralNetworks/runtime/ExecutionBuilder.cpp - aosp/packages/modules/NeuralNetworks/runtime/ExecutionCallback.cpp - aosp/packages/modules/NeuralNetworks/runtime/ExecutionPlan.cpp - aosp/packages/modules/NeuralNetworks/runtime/ServerFlag.cpp - aosp/packages/modules/NeuralNetworks/runtime/Manager.cpp - aosp/packages/modules/NeuralNetworks/runtime/Memory.cpp - aosp/packages/modules/NeuralNetworks/runtime/ModelArchHasher.cpp - aosp/packages/modules/NeuralNetworks/runtime/ModelArgumentInfo.cpp - aosp/packages/modules/NeuralNetworks/runtime/ModelBuilder.cpp - aosp/packages/modules/NeuralNetworks/runtime/NeuralNetworks.cpp - aosp/packages/modules/NeuralNetworks/runtime/SupportLibraryDiagnostic.cpp - aosp/packages/modules/NeuralNetworks/runtime/Telemetry.cpp - aosp/packages/modules/NeuralNetworks/runtime/TypeManager.cpp) + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/runtime/BurstBuilder.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/runtime/CompilationBuilder.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/runtime/ExecutionBuilder.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/runtime/ExecutionCallback.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/runtime/ExecutionPlan.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/runtime/ServerFlag.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/runtime/Manager.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/runtime/Memory.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/runtime/ModelArchHasher.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/runtime/ModelArgumentInfo.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/runtime/ModelBuilder.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/runtime/NeuralNetworks.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/runtime/SupportLibraryDiagnostic.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/runtime/Telemetry.cpp + ${AOSP_MODULES_ROOT}/packages/modules/NeuralNetworks/runtime/TypeManager.cpp) add_library(neuralnetworks_cl OBJECT ${neuralnetworks_cl_sources}) target_include_directories (neuralnetworks_cl PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) @@ -163,289 +161,293 @@ target_include_directories (neuralnetworks_cl PUBLIC ${libnnapi_support_include_ set(crypto_static_sources) list(APPEND crypto_static_sources - aosp/external/boringssl/err_data.c - aosp/external/boringssl/src/crypto/asn1/a_bitstr.c - aosp/external/boringssl/src/crypto/asn1/a_bool.c - aosp/external/boringssl/src/crypto/asn1/a_d2i_fp.c - aosp/external/boringssl/src/crypto/asn1/a_dup.c - aosp/external/boringssl/src/crypto/asn1/a_enum.c - aosp/external/boringssl/src/crypto/asn1/a_gentm.c - aosp/external/boringssl/src/crypto/asn1/a_i2d_fp.c - aosp/external/boringssl/src/crypto/asn1/a_int.c - aosp/external/boringssl/src/crypto/asn1/a_mbstr.c - aosp/external/boringssl/src/crypto/asn1/a_object.c - aosp/external/boringssl/src/crypto/asn1/a_octet.c - aosp/external/boringssl/src/crypto/asn1/a_print.c - aosp/external/boringssl/src/crypto/asn1/a_strex.c - aosp/external/boringssl/src/crypto/asn1/a_strnid.c - aosp/external/boringssl/src/crypto/asn1/a_time.c - aosp/external/boringssl/src/crypto/asn1/a_type.c - aosp/external/boringssl/src/crypto/asn1/a_utctm.c - aosp/external/boringssl/src/crypto/asn1/a_utf8.c - aosp/external/boringssl/src/crypto/asn1/asn1_lib.c - aosp/external/boringssl/src/crypto/asn1/asn1_par.c - aosp/external/boringssl/src/crypto/asn1/asn_pack.c - aosp/external/boringssl/src/crypto/asn1/f_int.c - aosp/external/boringssl/src/crypto/asn1/f_string.c - aosp/external/boringssl/src/crypto/asn1/tasn_dec.c - aosp/external/boringssl/src/crypto/asn1/tasn_enc.c - aosp/external/boringssl/src/crypto/asn1/tasn_fre.c - aosp/external/boringssl/src/crypto/asn1/tasn_new.c - aosp/external/boringssl/src/crypto/asn1/tasn_typ.c - aosp/external/boringssl/src/crypto/asn1/tasn_utl.c - aosp/external/boringssl/src/crypto/asn1/time_support.c - aosp/external/boringssl/src/crypto/base64/base64.c - aosp/external/boringssl/src/crypto/bio/bio.c - aosp/external/boringssl/src/crypto/bio/bio_mem.c - aosp/external/boringssl/src/crypto/bio/connect.c - aosp/external/boringssl/src/crypto/bio/fd.c - aosp/external/boringssl/src/crypto/bio/file.c - aosp/external/boringssl/src/crypto/bio/hexdump.c - aosp/external/boringssl/src/crypto/bio/pair.c - aosp/external/boringssl/src/crypto/bio/printf.c - aosp/external/boringssl/src/crypto/bio/socket.c - aosp/external/boringssl/src/crypto/bio/socket_helper.c - aosp/external/boringssl/src/crypto/blake2/blake2.c - aosp/external/boringssl/src/crypto/bn_extra/bn_asn1.c - aosp/external/boringssl/src/crypto/bn_extra/convert.c - aosp/external/boringssl/src/crypto/buf/buf.c - aosp/external/boringssl/src/crypto/bytestring/asn1_compat.c - aosp/external/boringssl/src/crypto/bytestring/ber.c - aosp/external/boringssl/src/crypto/bytestring/cbb.c - aosp/external/boringssl/src/crypto/bytestring/cbs.c - aosp/external/boringssl/src/crypto/bytestring/unicode.c - aosp/external/boringssl/src/crypto/bytestring/unicode.c - aosp/external/boringssl/src/crypto/chacha/chacha.c - aosp/external/boringssl/src/crypto/cipher_extra/cipher_extra.c - aosp/external/boringssl/src/crypto/cipher_extra/derive_key.c - aosp/external/boringssl/src/crypto/cipher_extra/e_aesccm.c - aosp/external/boringssl/src/crypto/cipher_extra/e_aesctrhmac.c - aosp/external/boringssl/src/crypto/cipher_extra/e_aesgcmsiv.c - aosp/external/boringssl/src/crypto/cipher_extra/e_chacha20poly1305.c - aosp/external/boringssl/src/crypto/cipher_extra/e_des.c - aosp/external/boringssl/src/crypto/cipher_extra/e_null.c - aosp/external/boringssl/src/crypto/cipher_extra/e_rc2.c - aosp/external/boringssl/src/crypto/cipher_extra/e_rc4.c - aosp/external/boringssl/src/crypto/cipher_extra/e_tls.c - aosp/external/boringssl/src/crypto/cipher_extra/tls_cbc.c - aosp/external/boringssl/src/crypto/cmac/cmac.c - aosp/external/boringssl/src/crypto/conf/conf.c - aosp/external/boringssl/src/crypto/cpu_aarch64_apple.c - aosp/external/boringssl/src/crypto/cpu_aarch64_fuchsia.c - aosp/external/boringssl/src/crypto/cpu_aarch64_linux.c - aosp/external/boringssl/src/crypto/cpu_aarch64_win.c - aosp/external/boringssl/src/crypto/cpu_arm.c - aosp/external/boringssl/src/crypto/cpu_arm_linux.c - aosp/external/boringssl/src/crypto/cpu_intel.c - aosp/external/boringssl/src/crypto/cpu_ppc64le.c - aosp/external/boringssl/src/crypto/crypto.c - aosp/external/boringssl/src/crypto/curve25519/curve25519.c - aosp/external/boringssl/src/crypto/curve25519/spake25519.c - aosp/external/boringssl/src/crypto/des/des.c - aosp/external/boringssl/src/crypto/dh_extra/dh_asn1.c - aosp/external/boringssl/src/crypto/dh_extra/params.c - aosp/external/boringssl/src/crypto/digest_extra/digest_extra.c - aosp/external/boringssl/src/crypto/dsa/dsa.c - aosp/external/boringssl/src/crypto/dsa/dsa_asn1.c - aosp/external/boringssl/src/crypto/ec_extra/ec_asn1.c - aosp/external/boringssl/src/crypto/ec_extra/ec_derive.c - aosp/external/boringssl/src/crypto/cipher_extra/e_aesccm.c - aosp/external/boringssl/src/crypto/cipher_extra/e_aesctrhmac.c - aosp/external/boringssl/src/crypto/cipher_extra/e_aesgcmsiv.c - aosp/external/boringssl/src/crypto/cipher_extra/e_chacha20poly1305.c - aosp/external/boringssl/src/crypto/cipher_extra/e_des.c - aosp/external/boringssl/src/crypto/cipher_extra/e_null.c - aosp/external/boringssl/src/crypto/cipher_extra/e_rc2.c - aosp/external/boringssl/src/crypto/cipher_extra/e_rc4.c - aosp/external/boringssl/src/crypto/cipher_extra/e_tls.c - aosp/external/boringssl/src/crypto/cipher_extra/tls_cbc.c - aosp/external/boringssl/src/crypto/cmac/cmac.c - aosp/external/boringssl/src/crypto/conf/conf.c - aosp/external/boringssl/src/crypto/cpu_aarch64_apple.c - aosp/external/boringssl/src/crypto/cpu_aarch64_fuchsia.c - aosp/external/boringssl/src/crypto/cpu_aarch64_linux.c - aosp/external/boringssl/src/crypto/cpu_aarch64_win.c - aosp/external/boringssl/src/crypto/cpu_arm.c - aosp/external/boringssl/src/crypto/cpu_arm_linux.c - aosp/external/boringssl/src/crypto/cpu_intel.c - aosp/external/boringssl/src/crypto/cpu_ppc64le.c - aosp/external/boringssl/src/crypto/crypto.c - aosp/external/boringssl/src/crypto/curve25519/curve25519.c - aosp/external/boringssl/src/crypto/curve25519/spake25519.c - aosp/external/boringssl/src/crypto/des/des.c - aosp/external/boringssl/src/crypto/dh_extra/dh_asn1.c - aosp/external/boringssl/src/crypto/dh_extra/params.c - aosp/external/boringssl/src/crypto/digest_extra/digest_extra.c - aosp/external/boringssl/src/crypto/dsa/dsa.c - aosp/external/boringssl/src/crypto/dsa/dsa_asn1.c - aosp/external/boringssl/src/crypto/ec_extra/ec_asn1.c - aosp/external/boringssl/src/crypto/ec_extra/ec_derive.c - aosp/external/boringssl/src/crypto/ec_extra/hash_to_curve.c - aosp/external/boringssl/src/crypto/ecdh_extra/ecdh_extra.c - aosp/external/boringssl/src/crypto/ecdsa_extra/ecdsa_asn1.c - aosp/external/boringssl/src/crypto/engine/engine.c - aosp/external/boringssl/src/crypto/err/err.c - aosp/external/boringssl/src/crypto/evp/digestsign.c - aosp/external/boringssl/src/crypto/evp/evp.c - aosp/external/boringssl/src/crypto/evp/evp_asn1.c - aosp/external/boringssl/src/crypto/evp/evp_ctx.c - aosp/external/boringssl/src/crypto/evp/p_dsa_asn1.c - aosp/external/boringssl/src/crypto/evp/p_ec.c - aosp/external/boringssl/src/crypto/evp/p_ec_asn1.c - aosp/external/boringssl/src/crypto/evp/p_ed25519.c - aosp/external/boringssl/src/crypto/evp/p_ed25519_asn1.c - aosp/external/boringssl/src/crypto/evp/p_rsa.c - aosp/external/boringssl/src/crypto/evp/p_rsa_asn1.c - aosp/external/boringssl/src/crypto/evp/p_x25519.c - aosp/external/boringssl/src/crypto/evp/p_x25519_asn1.c - aosp/external/boringssl/src/crypto/evp/pbkdf.c - aosp/external/boringssl/src/crypto/evp/print.c - aosp/external/boringssl/src/crypto/evp/scrypt.c - aosp/external/boringssl/src/crypto/evp/sign.c - aosp/external/boringssl/src/crypto/ex_data.c - aosp/external/boringssl/src/crypto/fipsmodule/fips_shared_support.c - aosp/external/boringssl/src/crypto/hkdf/hkdf.c - aosp/external/boringssl/src/crypto/hpke/hpke.c - aosp/external/boringssl/src/crypto/hrss/hrss.c - aosp/external/boringssl/src/crypto/lhash/lhash.c - aosp/external/boringssl/src/crypto/mem.c - aosp/external/boringssl/src/crypto/obj/obj.c - aosp/external/boringssl/src/crypto/obj/obj_xref.c - aosp/external/boringssl/src/crypto/pem/pem_all.c - aosp/external/boringssl/src/crypto/pem/pem_info.c - aosp/external/boringssl/src/crypto/pem/pem_lib.c - aosp/external/boringssl/src/crypto/pem/pem_oth.c - aosp/external/boringssl/src/crypto/pem/pem_pk8.c - aosp/external/boringssl/src/crypto/pem/pem_pkey.c - aosp/external/boringssl/src/crypto/pem/pem_x509.c - aosp/external/boringssl/src/crypto/pem/pem_xaux.c - aosp/external/boringssl/src/crypto/pkcs7/pkcs7.c - aosp/external/boringssl/src/crypto/pkcs7/pkcs7_x509.c - aosp/external/boringssl/src/crypto/pkcs8/p5_pbev2.c - aosp/external/boringssl/src/crypto/pkcs8/pkcs8.c - aosp/external/boringssl/src/crypto/pkcs8/pkcs8_x509.c - aosp/external/boringssl/src/crypto/poly1305/poly1305.c - aosp/external/boringssl/src/crypto/poly1305/poly1305_arm.c - aosp/external/boringssl/src/crypto/poly1305/poly1305_vec.c - aosp/external/boringssl/src/crypto/pool/pool.c - aosp/external/boringssl/src/crypto/rand_extra/deterministic.c - aosp/external/boringssl/src/crypto/rand_extra/forkunsafe.c - aosp/external/boringssl/src/crypto/rand_extra/fuchsia.c - aosp/external/boringssl/src/crypto/rand_extra/passive.c - aosp/external/boringssl/src/crypto/rand_extra/rand_extra.c - aosp/external/boringssl/src/crypto/rand_extra/windows.c - aosp/external/boringssl/src/crypto/rc4/rc4.c - aosp/external/boringssl/src/crypto/refcount_c11.c - aosp/external/boringssl/src/crypto/refcount_lock.c - aosp/external/boringssl/src/crypto/rsa_extra/rsa_asn1.c - aosp/external/boringssl/src/crypto/rsa_extra/rsa_print.c - aosp/external/boringssl/src/crypto/siphash/siphash.c - aosp/external/boringssl/src/crypto/stack/stack.c - aosp/external/boringssl/src/crypto/thread.c - aosp/external/boringssl/src/crypto/thread_none.c - aosp/external/boringssl/src/crypto/thread_pthread.c - aosp/external/boringssl/src/crypto/thread_win.c - aosp/external/boringssl/src/crypto/trust_token/pmbtoken.c - aosp/external/boringssl/src/crypto/trust_token/trust_token.c - aosp/external/boringssl/src/crypto/trust_token/voprf.c - aosp/external/boringssl/src/crypto/x509/a_digest.c - aosp/external/boringssl/src/crypto/x509/a_sign.c - aosp/external/boringssl/src/crypto/x509/a_verify.c - aosp/external/boringssl/src/crypto/x509/algorithm.c - aosp/external/boringssl/src/crypto/x509/asn1_gen.c - aosp/external/boringssl/src/crypto/x509/by_dir.c - aosp/external/boringssl/src/crypto/x509/by_file.c - aosp/external/boringssl/src/crypto/x509/i2d_pr.c - aosp/external/boringssl/src/crypto/x509/name_print.c - aosp/external/boringssl/src/crypto/x509/rsa_pss.c - aosp/external/boringssl/src/crypto/x509/t_crl.c - aosp/external/boringssl/src/crypto/x509/t_req.c - aosp/external/boringssl/src/crypto/x509/t_x509.c - aosp/external/boringssl/src/crypto/x509/t_x509a.c - aosp/external/boringssl/src/crypto/x509/x509.c - aosp/external/boringssl/src/crypto/x509/x509_att.c - aosp/external/boringssl/src/crypto/x509/x509_cmp.c - aosp/external/boringssl/src/crypto/x509/x509_d2.c - aosp/external/boringssl/src/crypto/x509/x509_def.c - aosp/external/boringssl/src/crypto/x509/x509_ext.c - aosp/external/boringssl/src/crypto/x509/x509_lu.c - aosp/external/boringssl/src/crypto/x509/x509_obj.c - aosp/external/boringssl/src/crypto/x509/x509_req.c - aosp/external/boringssl/src/crypto/x509/x509_set.c - aosp/external/boringssl/src/crypto/x509/x509_trs.c - aosp/external/boringssl/src/crypto/x509/x509_txt.c - aosp/external/boringssl/src/crypto/x509/x509_v3.c - aosp/external/boringssl/src/crypto/x509/x509_vfy.c - aosp/external/boringssl/src/crypto/x509/x509_vpm.c - aosp/external/boringssl/src/crypto/x509/x509cset.c - aosp/external/boringssl/src/crypto/x509/x509name.c - aosp/external/boringssl/src/crypto/x509/x509rset.c - aosp/external/boringssl/src/crypto/x509/x509spki.c - aosp/external/boringssl/src/crypto/x509/x_algor.c - aosp/external/boringssl/src/crypto/x509/x_all.c - aosp/external/boringssl/src/crypto/x509/x_attrib.c - aosp/external/boringssl/src/crypto/x509/x_crl.c - aosp/external/boringssl/src/crypto/x509/x_exten.c - aosp/external/boringssl/src/crypto/x509/x_info.c - aosp/external/boringssl/src/crypto/x509/x_name.c - aosp/external/boringssl/src/crypto/x509/x_pkey.c - aosp/external/boringssl/src/crypto/x509/x_pubkey.c - aosp/external/boringssl/src/crypto/x509/x_req.c - aosp/external/boringssl/src/crypto/x509/x_sig.c - aosp/external/boringssl/src/crypto/x509/x_spki.c - aosp/external/boringssl/src/crypto/x509/x_val.c - aosp/external/boringssl/src/crypto/x509/x_x509.c - aosp/external/boringssl/src/crypto/x509/x_x509a.c - aosp/external/boringssl/src/crypto/x509v3/pcy_cache.c - aosp/external/boringssl/src/crypto/x509v3/pcy_data.c - aosp/external/boringssl/src/crypto/x509v3/pcy_lib.c - aosp/external/boringssl/src/crypto/x509v3/pcy_map.c - aosp/external/boringssl/src/crypto/x509v3/pcy_node.c - aosp/external/boringssl/src/crypto/x509v3/pcy_tree.c - aosp/external/boringssl/src/crypto/x509v3/v3_akey.c - aosp/external/boringssl/src/crypto/x509v3/v3_akeya.c - aosp/external/boringssl/src/crypto/x509v3/v3_alt.c - aosp/external/boringssl/src/crypto/x509v3/v3_bcons.c - aosp/external/boringssl/src/crypto/x509v3/v3_bitst.c - aosp/external/boringssl/src/crypto/x509v3/v3_conf.c - aosp/external/boringssl/src/crypto/x509v3/v3_cpols.c - aosp/external/boringssl/src/crypto/x509v3/v3_crld.c - aosp/external/boringssl/src/crypto/x509v3/v3_enum.c - aosp/external/boringssl/src/crypto/x509v3/v3_extku.c - aosp/external/boringssl/src/crypto/x509v3/v3_genn.c - aosp/external/boringssl/src/crypto/x509v3/v3_ia5.c - aosp/external/boringssl/src/crypto/x509v3/v3_info.c - aosp/external/boringssl/src/crypto/x509v3/v3_int.c - aosp/external/boringssl/src/crypto/x509v3/v3_lib.c - aosp/external/boringssl/src/crypto/x509v3/v3_ncons.c - aosp/external/boringssl/src/crypto/x509v3/v3_ocsp.c - aosp/external/boringssl/src/crypto/x509v3/v3_pci.c - aosp/external/boringssl/src/crypto/x509v3/v3_pcia.c - aosp/external/boringssl/src/crypto/x509v3/v3_pcons.c - aosp/external/boringssl/src/crypto/x509v3/v3_pmaps.c - aosp/external/boringssl/src/crypto/x509v3/v3_prn.c - aosp/external/boringssl/src/crypto/x509v3/v3_purp.c - aosp/external/boringssl/src/crypto/x509v3/v3_skey.c - aosp/external/boringssl/src/crypto/x509v3/v3_utl.c - aosp/external/boringssl/src/crypto/fipsmodule/bcm.c - aosp/external/boringssl/linux-aarch64/crypto/chacha/chacha-armv8.S - aosp/external/boringssl/linux-aarch64/crypto/fipsmodule/aesv8-armx64.S - aosp/external/boringssl/linux-aarch64/crypto/fipsmodule/armv8-mont.S - aosp/external/boringssl/linux-aarch64/crypto/fipsmodule/ghash-neon-armv8.S - aosp/external/boringssl/linux-aarch64/crypto/fipsmodule/ghashv8-armx64.S - aosp/external/boringssl/linux-aarch64/crypto/fipsmodule/sha1-armv8.S - aosp/external/boringssl/linux-aarch64/crypto/fipsmodule/sha256-armv8.S - aosp/external/boringssl/linux-aarch64/crypto/fipsmodule/sha512-armv8.S - aosp/external/boringssl/linux-aarch64/crypto/fipsmodule/vpaes-armv8.S + ${AOSP_MODULES_ROOT}/external/boringssl/err_data.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/asn1/a_bitstr.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/asn1/a_bool.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/asn1/a_d2i_fp.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/asn1/a_dup.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/asn1/a_enum.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/asn1/a_gentm.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/asn1/a_i2d_fp.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/asn1/a_int.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/asn1/a_mbstr.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/asn1/a_object.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/asn1/a_octet.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/asn1/a_print.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/asn1/a_strex.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/asn1/a_strnid.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/asn1/a_time.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/asn1/a_type.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/asn1/a_utctm.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/asn1/a_utf8.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/asn1/asn1_lib.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/asn1/asn1_par.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/asn1/asn_pack.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/asn1/f_int.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/asn1/f_string.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/asn1/tasn_dec.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/asn1/tasn_enc.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/asn1/tasn_fre.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/asn1/tasn_new.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/asn1/tasn_typ.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/asn1/tasn_utl.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/asn1/time_support.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/base64/base64.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/bio/bio.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/bio/bio_mem.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/bio/connect.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/bio/fd.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/bio/file.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/bio/hexdump.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/bio/pair.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/bio/printf.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/bio/socket.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/bio/socket_helper.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/blake2/blake2.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/bn_extra/bn_asn1.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/bn_extra/convert.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/buf/buf.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/bytestring/asn1_compat.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/bytestring/ber.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/bytestring/cbb.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/bytestring/cbs.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/bytestring/unicode.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/bytestring/unicode.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/chacha/chacha.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/cipher_extra/cipher_extra.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/cipher_extra/derive_key.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/cipher_extra/e_aesccm.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/cipher_extra/e_aesctrhmac.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/cipher_extra/e_aesgcmsiv.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/cipher_extra/e_chacha20poly1305.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/cipher_extra/e_des.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/cipher_extra/e_null.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/cipher_extra/e_rc2.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/cipher_extra/e_rc4.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/cipher_extra/e_tls.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/cipher_extra/tls_cbc.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/cmac/cmac.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/conf/conf.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/cpu_aarch64_apple.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/cpu_aarch64_fuchsia.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/cpu_aarch64_linux.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/cpu_aarch64_win.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/cpu_arm.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/cpu_arm_linux.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/cpu_intel.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/cpu_ppc64le.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/crypto.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/curve25519/curve25519.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/curve25519/spake25519.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/des/des.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/dh_extra/dh_asn1.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/dh_extra/params.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/digest_extra/digest_extra.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/dsa/dsa.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/dsa/dsa_asn1.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/ec_extra/ec_asn1.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/ec_extra/ec_derive.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/cipher_extra/e_aesccm.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/cipher_extra/e_aesctrhmac.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/cipher_extra/e_aesgcmsiv.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/cipher_extra/e_chacha20poly1305.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/cipher_extra/e_des.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/cipher_extra/e_null.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/cipher_extra/e_rc2.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/cipher_extra/e_rc4.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/cipher_extra/e_tls.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/cipher_extra/tls_cbc.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/cmac/cmac.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/conf/conf.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/cpu_aarch64_apple.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/cpu_aarch64_fuchsia.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/cpu_aarch64_linux.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/cpu_aarch64_win.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/cpu_arm.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/cpu_arm_linux.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/cpu_intel.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/cpu_ppc64le.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/crypto.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/curve25519/curve25519.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/curve25519/spake25519.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/des/des.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/dh_extra/dh_asn1.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/dh_extra/params.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/digest_extra/digest_extra.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/dsa/dsa.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/dsa/dsa_asn1.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/ec_extra/ec_asn1.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/ec_extra/ec_derive.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/ec_extra/hash_to_curve.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/ecdh_extra/ecdh_extra.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/ecdsa_extra/ecdsa_asn1.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/engine/engine.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/err/err.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/evp/digestsign.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/evp/evp.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/evp/evp_asn1.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/evp/evp_ctx.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/evp/p_dsa_asn1.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/evp/p_ec.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/evp/p_ec_asn1.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/evp/p_ed25519.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/evp/p_ed25519_asn1.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/evp/p_rsa.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/evp/p_rsa_asn1.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/evp/p_x25519.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/evp/p_x25519_asn1.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/evp/pbkdf.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/evp/print.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/evp/scrypt.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/evp/sign.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/ex_data.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/fipsmodule/fips_shared_support.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/hkdf/hkdf.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/hpke/hpke.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/hrss/hrss.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/lhash/lhash.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/mem.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/obj/obj.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/obj/obj_xref.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/pem/pem_all.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/pem/pem_info.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/pem/pem_lib.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/pem/pem_oth.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/pem/pem_pk8.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/pem/pem_pkey.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/pem/pem_x509.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/pem/pem_xaux.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/pkcs7/pkcs7.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/pkcs7/pkcs7_x509.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/pkcs8/p5_pbev2.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/pkcs8/pkcs8.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/pkcs8/pkcs8_x509.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/poly1305/poly1305.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/poly1305/poly1305_arm.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/poly1305/poly1305_vec.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/pool/pool.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/rand_extra/deterministic.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/rand_extra/forkunsafe.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/rand_extra/fuchsia.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/rand_extra/passive.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/rand_extra/rand_extra.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/rand_extra/windows.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/rc4/rc4.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/refcount_c11.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/refcount_lock.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/rsa_extra/rsa_asn1.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/rsa_extra/rsa_print.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/siphash/siphash.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/stack/stack.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/thread.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/thread_none.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/thread_pthread.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/thread_win.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/trust_token/pmbtoken.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/trust_token/trust_token.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/trust_token/voprf.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509/a_digest.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509/a_sign.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509/a_verify.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509/algorithm.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509/asn1_gen.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509/by_dir.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509/by_file.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509/i2d_pr.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509/name_print.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509/rsa_pss.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509/t_crl.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509/t_req.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509/t_x509.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509/t_x509a.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509/x509.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509/x509_att.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509/x509_cmp.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509/x509_d2.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509/x509_def.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509/x509_ext.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509/x509_lu.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509/x509_obj.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509/x509_req.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509/x509_set.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509/x509_trs.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509/x509_txt.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509/x509_v3.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509/x509_vfy.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509/x509_vpm.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509/x509cset.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509/x509name.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509/x509rset.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509/x509spki.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509/x_algor.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509/x_all.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509/x_attrib.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509/x_crl.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509/x_exten.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509/x_info.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509/x_name.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509/x_pkey.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509/x_pubkey.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509/x_req.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509/x_sig.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509/x_spki.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509/x_val.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509/x_x509.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509/x_x509a.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509v3/pcy_cache.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509v3/pcy_data.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509v3/pcy_lib.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509v3/pcy_map.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509v3/pcy_node.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509v3/pcy_tree.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509v3/v3_akey.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509v3/v3_akeya.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509v3/v3_alt.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509v3/v3_bcons.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509v3/v3_bitst.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509v3/v3_conf.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509v3/v3_cpols.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509v3/v3_crld.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509v3/v3_enum.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509v3/v3_extku.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509v3/v3_genn.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509v3/v3_ia5.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509v3/v3_info.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509v3/v3_int.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509v3/v3_lib.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509v3/v3_ncons.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509v3/v3_ocsp.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509v3/v3_pci.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509v3/v3_pcia.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509v3/v3_pcons.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509v3/v3_pmaps.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509v3/v3_prn.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509v3/v3_purp.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509v3/v3_skey.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/x509v3/v3_utl.c + ${AOSP_MODULES_ROOT}/external/boringssl/src/crypto/fipsmodule/bcm.c + ${AOSP_MODULES_ROOT}/external/boringssl/linux-aarch64/crypto/chacha/chacha-armv8.S + ${AOSP_MODULES_ROOT}/external/boringssl/linux-aarch64/crypto/fipsmodule/aesv8-armx64.S + ${AOSP_MODULES_ROOT}/external/boringssl/linux-aarch64/crypto/fipsmodule/armv8-mont.S + ${AOSP_MODULES_ROOT}/external/boringssl/linux-aarch64/crypto/fipsmodule/ghash-neon-armv8.S + ${AOSP_MODULES_ROOT}/external/boringssl/linux-aarch64/crypto/fipsmodule/ghashv8-armx64.S + ${AOSP_MODULES_ROOT}/external/boringssl/linux-aarch64/crypto/fipsmodule/sha1-armv8.S + ${AOSP_MODULES_ROOT}/external/boringssl/linux-aarch64/crypto/fipsmodule/sha256-armv8.S + ${AOSP_MODULES_ROOT}/external/boringssl/linux-aarch64/crypto/fipsmodule/sha512-armv8.S + ${AOSP_MODULES_ROOT}/external/boringssl/linux-aarch64/crypto/fipsmodule/vpaes-armv8.S ) add_library(crypto_static STATIC ${crypto_static_sources}) target_include_directories (crypto_static PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories (crypto_static PUBLIC ${libnnapi_support_include_directories}) +message(STATUS "AOSP_MODULES_ROOT: ${AOSP_MODULES_ROOT}") + # Add Armnn as a Dependency message(STATUS "ARMNN_SOURCE_DIR: ${ARMNN_SOURCE_DIR}") -set(Armnn_DIR "${ARMNN_SOURCE_DIR}/build") +message(STATUS "Armnn_DIR: ${Armnn_DIR}") + +set(Armnn_DIR "${Armnn_DIR}") if(NOT ARMNN_SUB_PROJECT) find_package(Armnn REQUIRED CONFIG HINTS ${Armnn_DIR}) endif() diff --git a/shim/sl/scripts/clone_aosp_libs.sh b/shim/sl/scripts/clone_aosp_libs.sh index 3a8615a19a..362dbd6ca6 100755 --- a/shim/sl/scripts/clone_aosp_libs.sh +++ b/shim/sl/scripts/clone_aosp_libs.sh @@ -1,65 +1,80 @@ #!/usr/bin/env bash SCRIPT_PATH=$(dirname "$0") -AOSP_DIR="${SCRIPT_PATH}/../aosp/" +AOSP_WORKING_DIR=$1 + +if [ "$#" -ne 1 ]; then + echo "Usage: This script must be passed a single parameter which is a path " + echo " to an existing directory where the AOSP repo's will be cloned into." + echo "Error: No working directory path parameter provided." + exit 1 +fi +if [ ! -d "$1" ]; then + echo "Usage: This script must be passed a single parameter which is a path " + echo " to an existing directory where the AOSP repo's will be cloned into." + echo "Error: Working directory path provided is not a directory." + exit 1 +fi + +echo "AOSP_WORKING_DIR = $AOSP_WORKING_DIR" # NNAPI SUPPORT (SHA's for each repo taken from master branch 25/03/22) -git clone https://android.googlesource.com/platform/packages/modules/NeuralNetworks/ "${AOSP_DIR}/packages/modules/NeuralNetworks" -pushd "${AOSP_DIR}/packages/modules/NeuralNetworks" +git clone https://android.googlesource.com/platform/packages/modules/NeuralNetworks/ "${AOSP_WORKING_DIR}/packages/modules/NeuralNetworks" +pushd "${AOSP_WORKING_DIR}/packages/modules/NeuralNetworks" git checkout 9c2360318a35756addcd5d321a85f9270e0a04da popd -git clone https://android.googlesource.com/platform/system/core "${AOSP_DIR}/system/core/" -pushd "${AOSP_DIR}/system/core/" +git clone https://android.googlesource.com/platform/system/core "${AOSP_WORKING_DIR}/system/core/" +pushd "${AOSP_WORKING_DIR}/system/core/" git checkout c408ee943a1d9c486e4fac10bee7f76a61c75bab popd -git clone https://android.googlesource.com/platform/system/libbase "${AOSP_DIR}/system/libbase" -pushd "${AOSP_DIR}/system/libbase" +git clone https://android.googlesource.com/platform/system/libbase "${AOSP_WORKING_DIR}/system/libbase" +pushd "${AOSP_WORKING_DIR}/system/libbase" git checkout 2d235ac982044ea4985c39a834e2d85c6a8bca8f popd -git clone https://android.googlesource.com/platform/system/libfmq "${AOSP_DIR}/system/libfmq" -pushd "${AOSP_DIR}/system/libfmq" +git clone https://android.googlesource.com/platform/system/libfmq "${AOSP_WORKING_DIR}/system/libfmq" +pushd "${AOSP_WORKING_DIR}/system/libfmq" git checkout 331b20e54ddde93785d7688ebb0cdc1cbcf9fd9b popd -git clone https://android.googlesource.com/platform/frameworks/native "${AOSP_DIR}/frameworks/native" -pushd "${AOSP_DIR}/frameworks/native" +git clone https://android.googlesource.com/platform/frameworks/native "${AOSP_WORKING_DIR}/frameworks/native" +pushd "${AOSP_WORKING_DIR}/frameworks/native" git checkout fea6523ac18c9d4d40db04c996e833f60ff88489 popd -git clone https://android.googlesource.com/platform/system/logging "${AOSP_DIR}/system/logging" -pushd "${AOSP_DIR}/system/logging" +git clone https://android.googlesource.com/platform/system/logging "${AOSP_WORKING_DIR}/system/logging" +pushd "${AOSP_WORKING_DIR}/system/logging" git checkout e1a669e529cf5a42cd8b331ca89634bb9dce5cae popd -git clone https://android.googlesource.com/platform/external/boringssl "${AOSP_DIR}/external/boringssl" -pushd "${AOSP_DIR}/external/boringssl" +git clone https://android.googlesource.com/platform/external/boringssl "${AOSP_WORKING_DIR}/external/boringssl" +pushd "${AOSP_WORKING_DIR}/external/boringssl" git checkout ebeca38b4ecbe81fdf1d127ef7abb4689722308c popd -git clone https://android.googlesource.com/platform/external/tensorflow "${AOSP_DIR}/external/tensorflow" -pushd "${AOSP_DIR}/external/tensorflow" +git clone https://android.googlesource.com/platform/external/tensorflow "${AOSP_WORKING_DIR}/external/tensorflow" +pushd "${AOSP_WORKING_DIR}/external/tensorflow" git checkout a6772d90a9b542ceb50f35f67e1cebf322d8b0d0 popd -git clone https://android.googlesource.com/platform/external/eigen "${AOSP_DIR}/external/eigen" -pushd "${AOSP_DIR}/external/eigen" +git clone https://android.googlesource.com/platform/external/eigen "${AOSP_WORKING_DIR}/external/eigen" +pushd "${AOSP_WORKING_DIR}/external/eigen" git checkout 10f298fc4175c1b8537c674f654a070c871960e5 popd -git clone https://android.googlesource.com/platform/external/ruy "${AOSP_DIR}/external/ruy" -pushd "${AOSP_DIR}/external/ruy" +git clone https://android.googlesource.com/platform/external/ruy "${AOSP_WORKING_DIR}/external/ruy" +pushd "${AOSP_WORKING_DIR}/external/ruy" git checkout 4377b97cf0850e0a61caa191586ebe68ccbc2abf popd -git clone https://android.googlesource.com/platform/external/gemmlowp "${AOSP_DIR}/external/gemmlowp" -pushd "${AOSP_DIR}/external/gemmlowp" +git clone https://android.googlesource.com/platform/external/gemmlowp "${AOSP_WORKING_DIR}/external/gemmlowp" +pushd "${AOSP_WORKING_DIR}/external/gemmlowp" git checkout 689c69e88b91e7bff068e33396f74c0a5b17390e popd -git clone https://android.googlesource.com/platform/prebuilts/vndk/v29 "${AOSP_DIR}/prebuilts/vndk/v29" -pushd "${AOSP_DIR}/prebuilts/vndk/v29" +git clone https://android.googlesource.com/platform/prebuilts/vndk/v29 "${AOSP_WORKING_DIR}/prebuilts/vndk/v29" +pushd "${AOSP_WORKING_DIR}/prebuilts/vndk/v29" git checkout 5a73511dd91512681df643ce604d36763cd81b0e popd diff --git a/shim/sl/scripts/modify_aosp_libs.sh b/shim/sl/scripts/modify_aosp_libs.sh index 104e99105e..f2fc5c1937 100755 --- a/shim/sl/scripts/modify_aosp_libs.sh +++ b/shim/sl/scripts/modify_aosp_libs.sh @@ -1,21 +1,31 @@ #!/usr/bin/env bash +AOSP_WORKING_DIR=$1 + +if [ "$#" -ne 1 ]; then + + echo "Usage: This script must be passed a single parameter which is a path " + echo " to an existing directory where the AOSP repo's have been cloned." + echo "Error: No working directory path parameter provided." + exit 1 +fi +if [ ! -d "$1" ]; then + + echo "Usage: This script must be passed a single parameter which is a path " + echo " to an existing directory where the AOSP repo's have been cloned." + echo "Error: Working directory path provided is not a directory." + exit 1 +fi + SCRIPT_PATH=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) echo "SCRIPT_PATH= ${SCRIPT_PATH}" -AOSP_DIR="${SCRIPT_PATH}/../aosp/" -echo "AOSP_DIR= ${AOSP_DIR}" -pushd "${AOSP_DIR}/system/libbase/" +pushd "${AOSP_WORKING_DIR}/system/libbase/" echo "Applying libbase logging.cpp patch" git apply "${SCRIPT_PATH}/libbase_logging_cpp.patch" popd -pushd "${AOSP_DIR}/packages/modules/NeuralNetworks/" +pushd "${AOSP_WORKING_DIR}/packages/modules/NeuralNetworks/" echo "Applying NeuralNetworks patch" git apply "${SCRIPT_PATH}/NeuralNetworks.patch" popd - -pushd "${SCRIPT_PATH}/.." - echo "Renaming Android.mk and Android.bp to .DISABLED for NDK build only" - find ./aosp -name "*.bp" -exec bash -c 'mv "$1" "${1%.bp}".bp.DISABLED' - '{}' \; -popd -- cgit v1.2.1