diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-10 23:09:41 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-10 23:09:41 +0000 |
| commit | 294e681ded2c958fe454eb148b472793636e89ef (patch) | |
| tree | b3d632f5368c7d3b54724391857e15584e52de69 /audio | |
| parent | 78743e19b2eb189624ecf65d558737536dba35d9 (diff) | |
| parent | 981837366e29e938b1e35dd270b4d0fecf4fa6b4 (diff) | |
| download | platform_hardware_interfaces-294e681ded2c958fe454eb148b472793636e89ef.tar.gz platform_hardware_interfaces-294e681ded2c958fe454eb148b472793636e89ef.tar.bz2 platform_hardware_interfaces-294e681ded2c958fe454eb148b472793636e89ef.zip | |
Merge "Update copyHAL.sh after changes in libaudiohal" am: f2212ca85c am: 2bd5e654fb am: 981837366e
Change-Id: Idde37ba245a46a265a3697b14c3f0a90cc956d43
Diffstat (limited to 'audio')
| -rwxr-xr-x | audio/common/all-versions/copyHAL.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/audio/common/all-versions/copyHAL.sh b/audio/common/all-versions/copyHAL.sh index 56559d13e3..0a32a51275 100755 --- a/audio/common/all-versions/copyHAL.sh +++ b/audio/common/all-versions/copyHAL.sh @@ -21,7 +21,7 @@ readonly HAL_SERVICE_CPP=service.cpp readonly FWK_DIRECTORY=frameworks/av/media/libaudiohal readonly IMPL_DIRECTORY=impl -readonly IMPL_FACTORYHAL=$IMPL_DIRECTORY/include/libaudiohal/FactoryHalHidl.h +readonly IMPL_FACTORYHAL=FactoryHalHidl.cpp readonly VTS_DIRECTORY=test/vts-testcase/hal/audio readonly VTS_LIST=test/vts/tools/build/tasks/list/vts_test_lib_hidl_package_list.mk @@ -150,7 +150,7 @@ runIfNeeded $HAL_DIRECTORY createHALVersion createFrameworkAdapter() { updateVersion -v original_before=1 Android.bp - updateVersion -v original_before=1 -v RS= -v ORS='\n\n' $IMPL_FACTORYHAL/Android.bp + updateVersion -v original_before=1 -v RS= -v ORS='\n\n' $IMPL_DIRECTORY/Android.bp updateVersion -v original_after=1 $IMPL_FACTORYHAL } echo "Now creating the framework adapter version" |