Commit graph

337 commits

Author SHA1 Message Date
Steven Moreland
8b76a6b90d Remove subdirs
Removing whenever I see these in code reviews.

Test: none
Merged-In: I4322f533a837d55618ec2ed2125e8966ace9d61d
Change-Id: I4322f533a837d55618ec2ed2125e8966ace9d61d
2017-11-28 14:22:55 -08:00
Chih-Hung Hsieh
ae9fb022a3 Merge "Use -Werror in hardware/interfaces/audio"
am: 7a4422d2a5

Change-Id: Ib0cf1e15856fd58f0f2ea726e3d5b94177ab33a1
2017-11-28 19:03:31 +00:00
Chih-Hung Hsieh
b38c1aebc1 Use -Werror in hardware/interfaces/audio
* Remove unused variables, lambda function parameters..

Bug: 66996870
Test: build with WITH_TIDY=1
Change-Id: I28e8eb1af434f62cab6f41285b9a400f7f57cd13
2017-11-28 17:11:33 +00:00
Xin Li
bb9e38fef9 Merge commit '1a06284b24f5eb7bb9c1fea0817da8898b3b1bff' from
oc-mr1-dev-plus-aosp into stage-aosp-master

Change-Id: I2a044eb8c9981d0a8198ffe2df55559afbd76341
Merged-In: I4fb9f18884f7ef21162015a0032c4431444f7025
2017-11-14 12:08:38 -08:00
Steven Moreland
a1169dd600 Update makefiles for hidl_interface.
Bug: 35570956
Test: manual
Change-Id: I7a220b78ee081240e1dc30ef5672ba39e3e98375
2017-11-10 09:06:55 -08:00
Steven Moreland
90e3a50f03 Automatic mk -> bp.
Automatic mk -> bp conversion for all modules here
which can be converted and built automatically.

Test: Soong resolves all dependencies
Bug: 37512442
Change-Id: Ib789212cb88d55731397c600d132e7c672c0d8be
2017-11-03 16:30:28 +00:00
Tri Vo
976bfa63f8 Merge "Set pipe size to >1MB for debugDump test cases." am: d928053397 am: 04fcc83578
am: bd9b6d5c68

Change-Id: I0719153562f638d958f68f823bace7fb2dad3888
2017-10-18 02:56:55 +00:00
Tri Vo
bd9b6d5c68 Merge "Set pipe size to >1MB for debugDump test cases." am: d928053397
am: 04fcc83578

Change-Id: I268c1f1fd16732ffce1569a19d8efa47897fc329
2017-10-18 02:28:01 +00:00
Tri Vo
04fcc83578 Merge "Set pipe size to >1MB for debugDump test cases."
am: d928053397

Change-Id: If7cca83c1da491e5c399170e2669995e878fdc57
2017-10-18 02:21:29 +00:00
Tri Vo
7d35a3d0f2 Set pipe size to >1MB for debugDump test cases.
Test: VtsHalAudioV2_0Target
Change-Id: I2dd43851a43609ad2953030303edaeb684b63096
2017-10-17 16:51:33 -07:00
Tri Vo
e9c924d756 Merge "Use a pipe instead of tmp for debugDump tests." am: 458b8fa5bd am: c62e184a27
am: a56e32dca2

Change-Id: I9f450d87bc7737e14ad4ed0bab9670c6765fd5e2
2017-10-15 03:44:38 +00:00
Tri Vo
a56e32dca2 Merge "Use a pipe instead of tmp for debugDump tests." am: 458b8fa5bd
am: c62e184a27

Change-Id: If0f38272ff7a4e7982ef9273ed09be7d70b9de16
2017-10-15 03:01:13 +00:00
Tri Vo
c62e184a27 Merge "Use a pipe instead of tmp for debugDump tests."
am: 458b8fa5bd

Change-Id: Ife2cfb8b89c0f550648ea28c339e7278015399c0
2017-10-15 02:56:25 +00:00
Tri Vo
6c00ac31bb Use a pipe instead of tmp for debugDump tests.
Audio hal does not have selinux permissions to files under
/data/locat/tmp. We pass an fd to a pipe to the HAL instead.

Bug: 67665722
Test: VtsHalAudioV2_0Target
Change-Id: I695917be1816ba007f48afab5e978ab31024ffba
2017-10-12 15:47:34 -07:00
Steven Moreland
116161d94e Update for Soong java makefiles. am: c3e80fa01e am: 0fff75dee1
am: 6c811964a1

Change-Id: I85ccbb4a15cd18938607f5bca4e065b9d7e0182b
2017-10-11 16:31:07 +00:00
Steven Moreland
6c811964a1 Update for Soong java makefiles. am: c3e80fa01e
am: 0fff75dee1

Change-Id: I5b524ccf13233f3696881a2a670b5d2134fd5f15
2017-10-11 16:27:24 +00:00
Steven Moreland
0fff75dee1 Update for Soong java makefiles.
am: c3e80fa01e

Change-Id: Ia8835f9c95bd98a96f5fd3aff11191e7d3726fb9
2017-10-11 16:23:54 +00:00
Mikhail Naganov
d4cb163f12 Audio VTS: Allow 4GB buffer prepareToWrite/Read to succeed on 64 bits am: ce607879ba
am: 5b122a7408

Change-Id: Ifd8600fd7d24657dff4ed5b6f563806509c8029b
2017-10-11 01:35:41 +00:00
Mikhail Naganov
5b122a7408 Audio VTS: Allow 4GB buffer prepareToWrite/Read to succeed on 64 bits
am: ce607879ba

Change-Id: I6869d49ab5ceb12e1b0d3e50e0952094c34b3c07
2017-10-11 01:33:25 +00:00
Kevin Rocard
0534965a28 Merge "Legacy wrapper: Use arbitrary limit on buffer size" into oc-mr1-dev
am: 0f65d6e38a

Change-Id: I08d5eb2a782cb5fc60f6e297282ff179e6098ff0
2017-10-11 00:17:36 +00:00
Steven Moreland
c3e80fa01e Update for Soong java makefiles.
Test: pass
Bug: 33420795
Change-Id: Id9b1919a19b8ff682738cfb0869a479b4dbb4293
2017-10-10 23:07:20 +00:00
Mikhail Naganov
ce607879ba Audio VTS: Allow 4GB buffer prepareToWrite/Read to succeed on 64 bits
Because on oc-dev the runtime image can not be modified and that this is
not a bug but a test and implementation misalignment,
allow prepareForWrite/Read(UINT32_MAX, UINT32_MAX) to succeed on oc-dev.

MR1 will have a better fix where the HAL will always reject > 1GiB
buffers independently of the architecture.

Test: vts-tradefed run commandAndExit vts --module VtsHalAudioV2_0Target
Bug: 67030516
Change-Id: I10a5ee3868c67c45ed5297d9c5c89129d762c7cd
Merged-In: I4cc3efda9bb66e6dae8b4e6785f52d9e51440aee
Signed-off-by: Kevin Rocard <krocard@google.com>
2017-10-10 14:30:00 -07:00
Kevin Rocard
46cba442d2 Legacy wrapper: Use arbitrary limit on buffer size
The legacy HAL wrapper prepareForWrite and prepareForRead used
to return INVALID_ARGUMENTS if the computed buffer size just
under SIZE_MAX.

This meant that the limitation depended on the architecture (32 vs 64
bit size_t). This caused VTS test failure on 64 bits.

Instead of dynamically calculating an arbitrary max size,
choose a fixed one. This max buffer size has been chosen at 1GiB.
It should be enough for the foreseeable future and not too close
from the 4GiB max on 32 bit.

Test: vts-tradefed run commandAndExit vts --module VtsHalAudioV2_0Target
Bug: 67030516
Change-Id: I4cc3efda9bb66e6dae8b4e6785f52d9e51440aee
Signed-off-by: Kevin Rocard <krocard@google.com>
2017-10-10 09:22:02 -07:00
Steven Moreland
0653f3b212 Merge "Remove useless Android.mk files." am: 75d5cf515a am: f27cfa15d7
am: 33dc30ce49

Change-Id: Ia35d20e0fc1df6f7c46b5581537d7ed387965899
2017-10-05 21:51:13 +00:00
Steven Moreland
33dc30ce49 Merge "Remove useless Android.mk files." am: 75d5cf515a
am: f27cfa15d7

Change-Id: I2c554896e817483493faa5bbe54746d4f1c8b8da
2017-10-05 21:46:16 +00:00
Steven Moreland
f27cfa15d7 Merge "Remove useless Android.mk files."
am: 75d5cf515a

Change-Id: I8c0918c4a787cc3f4c7c69f52737d3a0d9d64426
2017-10-05 21:44:26 +00:00
Treehugger Robot
75d5cf515a Merge "Remove useless Android.mk files." 2017-10-05 21:40:27 +00:00
Steven Moreland
4b60470f1a Remove useless Android.mk files.
These have been c/p'd all over the place.

Test: m -j nothing
Bug: 33420795
Change-Id: I77979866dbb2345a41a873c84ec3fccd7b127510
2017-10-04 15:52:40 -07:00
Steven Moreland
9a17f41f6f Merge "Update for hidl adapter module defaults." am: 988c977079 am: 861651985f
am: b53e6ad535

Change-Id: I23269fb7a9bdd352e670a80f390527d9eef31412
2017-10-04 21:51:00 +00:00
Steven Moreland
b53e6ad535 Merge "Update for hidl adapter module defaults." am: 988c977079
am: 861651985f

Change-Id: Ifdb878720d42120e7309dd2a49e5a91059ff4b72
2017-10-04 21:48:04 +00:00
Steven Moreland
861651985f Merge "Update for hidl adapter module defaults."
am: 988c977079

Change-Id: I289818be1b30397391847ba1c532d1014fdbed27
2017-10-04 21:45:09 +00:00
Treehugger Robot
988c977079 Merge "Update for hidl adapter module defaults." 2017-10-04 21:36:25 +00:00
Chih-hung Hsieh
9890348480 Merge "Use -Werror in hardware/interfaces" am: 85bb01dd6b am: 3ed04cd35d
am: baf19e17b3

Change-Id: I8806a9887178a7f778cc556c804a5b7a05d59836
2017-10-04 21:04:44 +00:00
Chih-hung Hsieh
baf19e17b3 Merge "Use -Werror in hardware/interfaces" am: 85bb01dd6b
am: 3ed04cd35d

Change-Id: I66c74139be9c7736beb354b5da0381668f4e68c5
2017-10-04 20:49:30 +00:00
Chih-hung Hsieh
3ed04cd35d Merge "Use -Werror in hardware/interfaces"
am: 85bb01dd6b

Change-Id: I9169eb99a256f3a1db9e6f82e11fd96228d9558a
2017-10-04 20:40:30 +00:00
Steven Moreland
527fd76a0e Update for hidl adapter module defaults.
Test: pass
Change-Id: Idc6a943149a279bf17cfcfd0f2571473e53bbbbf
2017-10-04 12:47:03 -07:00
Chih-Hung Hsieh
3da5b01946 Use -Werror in hardware/interfaces
* Remove unused local variables.

Bug: 66996870
Test: build with WITH_TIDY=1
Change-Id: I48dbbf670cc9eeff2391983788983420f8547cc9
2017-10-04 11:16:31 -07:00
Steven Moreland
9fdd241905 Merge "Fix typo in update makefiles." am: 9960148420 am: f07e364ce3
am: 71a193a425

Change-Id: I45ae43f07323254212532acbf0f891d11143b05f
2017-09-26 23:58:51 +00:00
Steven Moreland
71a193a425 Merge "Fix typo in update makefiles." am: 9960148420
am: f07e364ce3

Change-Id: If5bbf259458363b755989578c2f3828cbcb3d07c
2017-09-26 23:55:59 +00:00
Steven Moreland
f07e364ce3 Merge "Fix typo in update makefiles."
am: 9960148420

Change-Id: I949634e72f817f3a5411130e968acd8efd1d7725
2017-09-26 23:51:07 +00:00
Steven Moreland
a5299ee739 Fix typo in update makefiles.
Bug: 37518178
Test: pass
Change-Id: Ic401b3a473f15ca4c01e58b3072e19db7c31b653
2017-09-26 21:59:43 +00:00
Steven Moreland
97228c0b7d Update makefiles for hidl adapter. am: 26a0bb2762 am: 73949c1d7e
am: b94d0c7290

Change-Id: If766cffbcc003cc0cc5eb98969b924aa918fff44
2017-09-26 12:53:13 +00:00
Steven Moreland
b94d0c7290 Update makefiles for hidl adapter. am: 26a0bb2762
am: 73949c1d7e

Change-Id: I9af2df255ccdac36c8c11bbca973c42ea2e758fe
2017-09-26 12:48:40 +00:00
Steven Moreland
73949c1d7e Update makefiles for hidl adapter.
am: 26a0bb2762

Change-Id: I3a811f5cd49bd4e81e8fcd5c8e88922115812539
2017-09-25 23:14:44 +00:00
Steven Moreland
26a0bb2762 Update makefiles for hidl adapter.
Bug: 37518178
Test: manual
Change-Id: I50e999907d3c64d2b039272b823971998da64d1b
2017-09-25 18:35:56 +00:00
Kevin Rocard
bda21c95d3 Audio VTS: do not test duplicate policy configuration file am: ff7dcd7e4d
am: ecf7848f67

Change-Id: I79f97fb002e036c17b7ab42f1af00ed2b17e60fd
2017-09-14 16:52:54 +00:00
Kevin Rocard
6e72cba5c3 Audio VTS: do not test duplicate policy configuration file am: ff7dcd7e4d
am: ecf7848f67

Change-Id: I781f6eeeb75f3a0d6feed1278a49699e024c2128
2017-09-14 16:52:54 +00:00
Kevin Rocard
ecf7848f67 Audio VTS: do not test duplicate policy configuration file
am: ff7dcd7e4d

Change-Id: Ice54f75c307f9f25e210b1382554dc24162b9ace
2017-09-14 16:48:56 +00:00
Kevin Rocard
ff7dcd7e4d Audio VTS: do not test duplicate policy configuration file
This patch only modifies the VTS tests.

O generic policy configuration fallback is incorrect
(see I2a39606cd820b5cd27a640248bf692204ec2cd71 for the fix).
Nevertheless, has no impact on products because this fallback
is only used in aosp builds and GSI.

Unfortunatly, this break the VTS test when run agains GSI.
Because it is too late to change GSI for Oc and DR,
relax the test to support current O GSI.

For P, ihis patch will not be part of VTS
and the fallback config will be fixed.

Bug: 65535343
Merged-In: I2a39606cd820b5cd27a640248bf692204ec2cd71
Test: Following script:

setup() {
    BUILD_ID=$1
    TARGET_PRODUCT=$2
    TARGET_BUILD_TYPE=${3:-userdebug}
    TARGET_ARCH=${4:-arm64}
    set +x

    echo "The following three variables can be overridden" \
         "by setting the corresponding environment variable"
    set -x
    TEST_SUITES_TARGET=${VTS_TEST_SUITES_TARGET:-test_suites_${TARGET_ARCH}}
    BASE_TARGET=${VTS_BASE_TARGET:-${TARGET_PRODUCT}-${TARGET_BUILD_TYPE}}
    AOSP_TARGET=${VTS_AOSP_TARGET:-aosp_${TARGET_ARCH}_ab-${TARGET_BUILD_TYPE}}
    set +x

    download() {
        local target=$1
        local file=$2
        test -f $file ||
            /google/data/ro/projects/android/fetch_artifact --bid $BUILD_ID --target $target $file ||
            { local r=$?; rm $file; return $r; }
    }

    echo "Downloading"
    download $TEST_SUITES_TARGET 'android-vts.zip'
    download $BASE_TARGET "${TARGET_PRODUCT}-img-${BUILD_ID}.zip"
    download $AOSP_TARGET "aosp_${TARGET_ARCH}_ab-img-${BUILD_ID}.zip"

    echo "Unzipping"
    rm -r system.img android-vts
    unzip aosp_${TARGET_ARCH}_ab-img-$BUILD_ID.zip system.img
    unzip android-vts.zip

    echo "Building vbmeta without verity"
    avbtool make_vbmeta_image --flag 2 --output vbmeta.img

    set -x
    adb reboot bootloader
    fastboot update ${TARGET_PRODUCT}-img-$BUILD_ID.zip --skip-reboot
    fastboot flash vbmeta vbmeta.img || echo "Warning: Device does not support vbmeta"
    fastboot erase system
    fastboot flash system system.img
    fastboot erase metadata
    fastboot -w
    fastboot reboot
    
    echo "Board setup"
    echo "You may now start vts-tradefed with:"
    echo '$ ANDROID_BUILD_TOP= PATH="$PWD:$PATH" vts-tradefed'
}
VTS_TEST_SUITES_TARGET=test_suites_arm64_fastbuild3d_linux setup 4327646 sailfish
 vts-tradefed run commandAndExit vts --skip-all-system-status-check --primary-abi-only --skip-preconditions --module VtsHalAudioV2_0Target -t CheckConfig.audioPolicyConfigurationValidation

Change-Id: Ibe1feed41325a3e4fb25e959bd254156348aa584
Signed-off-by: Kevin Rocard <krocard@google.com>
2017-09-14 07:39:25 +00:00
Kevin Rocard
12c64f9ea2 Audio VTS: remove expectation of policy configuration unicity am: 76efe01bbd
am: 6b51d9a855

Change-Id: I6a6987ed0155788a211b2cc2f86ec8c9f338165c
2017-09-08 22:14:14 +00:00