Snap for 4813226 from ddb8069159acc545713533e8745b8250c63dc8e8 to pi-release
Change-Id: I8e9b10ee5f348e778fb559f2db4ce6ab8a51b1bb
Change-Id: I8e9b10ee5f348e778fb559f2db4ce6ab8a51b1bb
resolve merge conflicts of ddb8069159acc545713533e8745b8250c63dc8e8 to pi-dev-plus-aosp
BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I46c6d4a6bd63abd3d75d41e632966fd3f2a59526
BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I46c6d4a6bd63abd3d75d41e632966fd3f2a59526
Add checkvintf to dist for inter branch build targets am: 32b2052088
am: 24bbf7dd08
Change-Id: I672869bff55e7c801ed646c04e8e6c4e87799dca
am: 24bbf7dd08
Change-Id: I672869bff55e7c801ed646c04e8e6c4e87799dca
Add checkvintf to dist for inter branch build targets
am: 32b2052088
Change-Id: If18503d54dfe09039831da47db0136b6e2bee966
am: 32b2052088
Change-Id: If18503d54dfe09039831da47db0136b6e2bee966
Add checkvintf to dist for inter branch build targets
checkvintf is used to check the compatibility between system and
vendor for mixed build targets such as P GSI + O-MR1 vendor.
These inter branch build targets will be built from a new manifest
branch, as mandated by the guideline in go/build_chaining. Adding
checkvintf to dist allows us to get this tool from the parent
target instead of having to build in the lightweight manifest
branch.
Bug: 74214049
Test: lunch aosp_arm64_ab-userdebug; make -j dist; confirm that
checkvintf is outputed under DIST_DIR
Change-Id: I2b2a72225772b40096363e70374e441f7f9e756d
Merged-In: I2b2a72225772b40096363e70374e441f7f9e756d
checkvintf is used to check the compatibility between system and
vendor for mixed build targets such as P GSI + O-MR1 vendor.
These inter branch build targets will be built from a new manifest
branch, as mandated by the guideline in go/build_chaining. Adding
checkvintf to dist allows us to get this tool from the parent
target instead of having to build in the lightweight manifest
branch.
Bug: 74214049
Test: lunch aosp_arm64_ab-userdebug; make -j dist; confirm that
checkvintf is outputed under DIST_DIR
Change-Id: I2b2a72225772b40096363e70374e441f7f9e756d
Merged-In: I2b2a72225772b40096363e70374e441f7f9e756d
Add contains(Arch, Arch) am: 0773e13046
am: 5c214db00a
Change-Id: I364efa71aff9fb31908f7b8a236451db0779851f
am: 5c214db00a
Change-Id: I364efa71aff9fb31908f7b8a236451db0779851f
Add contains(Arch, Arch)
... that returns true if the second value
is a subset of the first value.
Test: builds (static_asserts)
Change-Id: Ifc739b114521771862d967cada812f3e319f5109
... that returns true if the second value
is a subset of the first value.
Test: builds (static_asserts)
Change-Id: Ifc739b114521771862d967cada812f3e319f5109
Add checkvintf to dist for inter branch build targets
checkvintf is used to check the compatibility between system and
vendor for mixed build targets such as P GSI + O-MR1 vendor.
These inter branch build targets will be built from a new manifest
branch, as mandated by the guideline in go/build_chaining. Adding
checkvintf to dist allows us to get this tool from the parent
target instead of having to build in the lightweight manifest
branch.
Bug: 74214049
Test: lunch aosp_arm64_ab-userdebug; make -j dist; confirm that
checkvintf is outputed under DIST_DIR
Change-Id: Iac3ecc7127c351000b36710f8adf06c61ae51799
Merged-In: I2b2a72225772b40096363e70374e441f7f9e756d
checkvintf is used to check the compatibility between system and
vendor for mixed build targets such as P GSI + O-MR1 vendor.
These inter branch build targets will be built from a new manifest
branch, as mandated by the guideline in go/build_chaining. Adding
checkvintf to dist allows us to get this tool from the parent
target instead of having to build in the lightweight manifest
branch.
Bug: 74214049
Test: lunch aosp_arm64_ab-userdebug; make -j dist; confirm that
checkvintf is outputed under DIST_DIR
Change-Id: Iac3ecc7127c351000b36710f8adf06c61ae51799
Merged-In: I2b2a72225772b40096363e70374e441f7f9e756d
Allow to get <vendor-ndk><version> from matrix am: 52b7faece3
am: a76a101c97
Change-Id: Id4b430633d40162b62be34355a7c34398e8d8b37
am: a76a101c97
Change-Id: Id4b430633d40162b62be34355a7c34398e8d8b37
Allow to get <vendor-ndk><version> from matrix
am: 52b7faece3
Change-Id: I514a5632aaa95acda3d7ad3ef19ee57307254653
am: 52b7faece3
Change-Id: I514a5632aaa95acda3d7ad3ef19ee57307254653
Allow to get <vendor-ndk><version> from matrix
Test: vts_treble_vintf_vendor_test
Test: libvintf_test
Bug: 78117402
Change-Id: I4da7d23a354a59aaa27d0b61f8fd98a54f0fb1ec
Test: vts_treble_vintf_vendor_test
Test: libvintf_test
Bug: 78117402
Change-Id: I4da7d23a354a59aaa27d0b61f8fd98a54f0fb1ec
Hide HalGroup::getHals am: 2eb2cb4900
am: 686493f8b9
Change-Id: I8475b110bf33d21348c1a49a883d44c7b9f4651f
am: 686493f8b9
Change-Id: I8475b110bf33d21348c1a49a883d44c7b9f4651f
Hide HalGroup::getHals
Test: builds
Test: libvintf_test
Fixes: 74247301
Change-Id: Ie3b58ab42e66fab2f9d2e5d490461476d5c84d5d
Test: builds
Test: libvintf_test
Fixes: 74247301
Change-Id: Ie3b58ab42e66fab2f9d2e5d490461476d5c84d5d
Merge changes from topic "lshal_fqname" am: 588955a06e
am: ca984683bc
Change-Id: I61b83c76c88702831cce34f8090cef1bc5a8dbfc
am: ca984683bc
Change-Id: I61b83c76c88702831cce34f8090cef1bc5a8dbfc
Merge changes from topic "lshal_fqname"
am: 588955a06e
Change-Id: I16f1cb0b0dd1488fc2b11f09e5ac6abb0e273c5f
am: 588955a06e
Change-Id: I16f1cb0b0dd1488fc2b11f09e5ac6abb0e273c5f
5 years agoMerge changes from topic "lshal_fqname" android-o-mr1-iot-release-1.0.0 android-wear-p-preview-2
Merge changes from topic "lshal_fqname"
* changes:
Add HalManifest::insertInstance
Remove unused ManfiestHal::insertLegacyInstance
Add ManifestHal::insertInstance
Add more types to MapValueIterator.
Add TransportArch constructors.
* changes:
Add HalManifest::insertInstance
Remove unused ManfiestHal::insertLegacyInstance
Add ManifestHal::insertInstance
Add more types to MapValueIterator.
Add TransportArch constructors.
Merge "Don't override BOARD_SEPOLICY_VERS if already set." am: eea41348e1
am: 6cff9397de
Change-Id: Ib78cadc18ec60c85c7b9d40a8d490a9b4abbbe90
am: 6cff9397de
Change-Id: Ib78cadc18ec60c85c7b9d40a8d490a9b4abbbe90
Merge "Don't override BOARD_SEPOLICY_VERS if already set."
am: eea41348e1
Change-Id: Ided0fb928214b3795f0d232c9e5c58c844ae7a07
am: eea41348e1
Change-Id: Ided0fb928214b3795f0d232c9e5c58c844ae7a07
Merge "Don't override BOARD_SEPOLICY_VERS if already set."
Add HalManifest::insertInstance
This is an API to add the new <fqname> tags. This helps,
for example, lshal.
Bug:74247301
Test: libvintf_test
Change-Id: Iae3f9bae7120e430b376171c4e23b7d1d0798c06
This is an API to add the new <fqname> tags. This helps,
for example, lshal.
Bug:74247301
Test: libvintf_test
Change-Id: Iae3f9bae7120e430b376171c4e23b7d1d0798c06
Remove unused ManfiestHal::insertLegacyInstance
This API was used by lshal to insert <interface>
<instance> tags. Now lshal insert <fqname> tags
via insertInstance.
Test: builds
Bug: 74247301
Change-Id: Ia5bf158d7d05df6c80f90f915705be7e87ea6ee8
This API was used by lshal to insert <interface>
<instance> tags. Now lshal insert <fqname> tags
via insertInstance.
Test: builds
Bug: 74247301
Change-Id: Ia5bf158d7d05df6c80f90f915705be7e87ea6ee8
Add ManifestHal::insertInstance
... that allows to add <fqname> to ManifestHal object from code.
This helps, for example, lshal.
Bug: 74247301
Test: pass
Change-Id: I28b5bb1240e24f1762d2df4cb1ded242fabea99e
... that allows to add <fqname> to ManifestHal object from code.
This helps, for example, lshal.
Bug: 74247301
Test: pass
Change-Id: I28b5bb1240e24f1762d2df4cb1ded242fabea99e
Add more types to MapValueIterator.
iterateValues() accept non-const maps.
Test: pass
Bug: 74247301
Change-Id: Ib565c326570e62d7232a417a0dd58e59061d6265
iterateValues() accept non-const maps.
Test: pass
Bug: 74247301
Change-Id: Ib565c326570e62d7232a417a0dd58e59061d6265
Add TransportArch constructors.
Test: pass
Bug: 74247301
Change-Id: Ie3c744c364b79ea87f6100f09bd019e86c24bea1
Test: pass
Bug: 74247301
Change-Id: Ie3c744c364b79ea87f6100f09bd019e86c24bea1
Don't override BOARD_SEPOLICY_VERS if already set.
Allow the input manifest to already contain BOARD_SEPOLICY_VERS.
Bug: 78943004 # for full combine
Test: m assembled_framework_manifest.xml produces correct manifest w/o
warning + w/o overriding sepolicy vers.
Change-Id: Ieb98d8a650fb8f5791f08e378514d3f8f04f131f
Allow the input manifest to already contain BOARD_SEPOLICY_VERS.
Bug: 78943004 # for full combine
Test: m assembled_framework_manifest.xml produces correct manifest w/o
warning + w/o overriding sepolicy vers.
Change-Id: Ieb98d8a650fb8f5791f08e378514d3f8f04f131f
Merge "assemble_vintf: Update -c help message." am: 731c36aff1
am: b0886dd106
Change-Id: Iacf54c2f01a59bc71812e926979185f3e51b20a3
am: b0886dd106
Change-Id: Iacf54c2f01a59bc71812e926979185f3e51b20a3
Merge "assemble_vintf: Update -c help message."
am: 731c36aff1
Change-Id: Ib674bd903cf59cd3a1e9e8c19316ffb90f8ea271
am: 731c36aff1
Change-Id: Ib674bd903cf59cd3a1e9e8c19316ffb90f8ea271
Merge "assemble_vintf: Update -c help message."
assemble_vintf: Update -c help message.
Test: assemble_vintf --help
Change-Id: I17a928f106a1a886f98d4893cd75da843857f1c5
Fixes: 78895849
Test: assemble_vintf --help
Change-Id: I17a928f106a1a886f98d4893cd75da843857f1c5
Fixes: 78895849
[automerger skipped] CompatibilityMatrix::combine add <kernel> from new matrices am: d6de7f696c
am: 55c2afa2fd -s ours
Change-Id: I5ed71d51b5ee58ab3b0713bc934fac96275a5ce7
am: 55c2afa2fd -s ours
Change-Id: I5ed71d51b5ee58ab3b0713bc934fac96275a5ce7
CompatibilityMatrix::combine add <kernel> from new matrices
am: d6de7f696c
Change-Id: Ie9cb06b9fdfb0d60cbe9d84bf4d6429e7f2dae45
am: d6de7f696c
Change-Id: Ie9cb06b9fdfb0d60cbe9d84bf4d6429e7f2dae45
CompatibilityMatrix::combine add <kernel> from new matrices
Just as <hal> and <xmlfile> are added from new matrices
to old matrices as optional, so are <kernel> tags as well.
This avoids the hack that new <kernel> versions are added
retroactively. Specifically, we don't want to add 4.14 to
every matrix, but rather let libvintf do this automagically.
Bug: 78576469
Test: vintf_object_test
Test: libvintf_test
Test: manually inspect built matrices
Change-Id: Ia779c5e25c7c3db218007d23e4c887e8cd44e730
Merged-In: Ia779c5e25c7c3db218007d23e4c887e8cd44e730
Just as <hal> and <xmlfile> are added from new matrices
to old matrices as optional, so are <kernel> tags as well.
This avoids the hack that new <kernel> versions are added
retroactively. Specifically, we don't want to add 4.14 to
every matrix, but rather let libvintf do this automagically.
Bug: 78576469
Test: vintf_object_test
Test: libvintf_test
Test: manually inspect built matrices
Change-Id: Ia779c5e25c7c3db218007d23e4c887e8cd44e730
Merged-In: Ia779c5e25c7c3db218007d23e4c887e8cd44e730
Snap for 4751833 from 29aa7f59032a7d5cc4c91dcb79fe9c5fc5a34720 to pi-release
Change-Id: Ie09cef0eb3a8a2d6bf8c7b43ec2996b0727c39e0
Change-Id: Ie09cef0eb3a8a2d6bf8c7b43ec2996b0727c39e0
CompatibilityMatrix::combine add <kernel> from new matrices
am: 29aa7f5903
Change-Id: Icb81031b50671069b546c9bac7c3c1a0d01d4515
am: 29aa7f5903
Change-Id: Icb81031b50671069b546c9bac7c3c1a0d01d4515
CompatibilityMatrix::combine add <kernel> from new matrices
Just as <hal> and <xmlfile> are added from new matrices
to old matrices as optional, so are <kernel> tags as well.
This avoids the hack that new <kernel> versions are added
retroactively. Specifically, we don't want to add 4.14 to
every matrix, but rather let libvintf do this automagically.
Bug: 78576469
Test: vintf_object_test
Test: libvintf_test
Test: manually inspect built matrices
Change-Id: Ia779c5e25c7c3db218007d23e4c887e8cd44e730
Just as <hal> and <xmlfile> are added from new matrices
to old matrices as optional, so are <kernel> tags as well.
This avoids the hack that new <kernel> versions are added
retroactively. Specifically, we don't want to add 4.14 to
every matrix, but rather let libvintf do this automagically.
Bug: 78576469
Test: vintf_object_test
Test: libvintf_test
Test: manually inspect built matrices
Change-Id: Ia779c5e25c7c3db218007d23e4c887e8cd44e730
5 years ago[automerger skipped] Merge "Compat if POLICYVERS <= security_policyvers()" am: 1dd79d71f5
[automerger skipped] Merge "Compat if POLICYVERS <= security_policyvers()" am: 1dd79d71f5
am: 3845d35b4d -s ours
Change-Id: If03169a6f3bb5d24716c4a01348b7fcf55386b62
am: 3845d35b4d -s ours
Change-Id: If03169a6f3bb5d24716c4a01348b7fcf55386b62
Merge "Compat if POLICYVERS <= security_policyvers()"
am: 1dd79d71f5
Change-Id: Ibd201b1701df5073b82916b092fa5497ea1e8e6f
am: 1dd79d71f5
Change-Id: Ibd201b1701df5073b82916b092fa5497ea1e8e6f
Merge "Compat if POLICYVERS <= security_policyvers()"
Snap for 4725392 from 9893552f4395296e509ce0d006b32593cb748d69 to pi-release
Change-Id: Ie24367dd486a70e7d38312b114b9bd8d5dfd03b4
Change-Id: Ie24367dd486a70e7d38312b114b9bd8d5dfd03b4
Compat if POLICYVERS <= security_policyvers()
am: 9893552f43
Change-Id: I7b0048f26d472ba650018e711369e4279c7c2c25
am: 9893552f43
Change-Id: I7b0048f26d472ba650018e711369e4279c7c2c25
Compat if POLICYVERS <= security_policyvers()
POLICYVERS in the build system specifies the
policydb version that the policy is compiled with.
security_policyvers() specifies the maximum
policy version that the kernel is compatible with.
Allow POLICYVERS <= security_policyvers() to be considered
compatible.
This changes compatibility check logic for RuntimeInfo,
hence this does not affect OTA, except the following
case:
* device kernel reports 30
* new images are built with POLICYVERS=31
* fwk matrix has 31
* device do OTA with these images
* OTA will fail
Right now, since there are no plans to bump POLICYVERS
in build system (and it stays 30), OTA won't break.
Bug: 77886167
Test: vts_treble_vintf_test
Change-Id: I91fb631b291d17e26ad1a9befb669aac6b7ed654
Merged-In: I91fb631b291d17e26ad1a9befb669aac6b7ed654
POLICYVERS in the build system specifies the
policydb version that the policy is compiled with.
security_policyvers() specifies the maximum
policy version that the kernel is compatible with.
Allow POLICYVERS <= security_policyvers() to be considered
compatible.
This changes compatibility check logic for RuntimeInfo,
hence this does not affect OTA, except the following
case:
* device kernel reports 30
* new images are built with POLICYVERS=31
* fwk matrix has 31
* device do OTA with these images
* OTA will fail
Right now, since there are no plans to bump POLICYVERS
in build system (and it stays 30), OTA won't break.
Bug: 77886167
Test: vts_treble_vintf_test
Change-Id: I91fb631b291d17e26ad1a9befb669aac6b7ed654
Merged-In: I91fb631b291d17e26ad1a9befb669aac6b7ed654
Compat if POLICYVERS <= security_policyvers()
POLICYVERS in the build system specifies the
policydb version that the policy is compiled with.
security_policyvers() specifies the maximum
policy version that the kernel is compatible with.
Allow POLICYVERS <= security_policyvers() to be considered
compatible.
This changes compatibility check logic for RuntimeInfo,
hence this does not affect OTA, except the following
case:
* device kernel reports 30
* new images are built with POLICYVERS=31
* fwk matrix has 31
* device do OTA with these images
* OTA will fail
Right now, since there are no plans to bump POLICYVERS
in build system (and it stays 30), OTA won't break.
Bug: 77886167
Test: vts_treble_vintf_test
Change-Id: I91fb631b291d17e26ad1a9befb669aac6b7ed654
Merged-In: I91fb631b291d17e26ad1a9befb669aac6b7ed654
POLICYVERS in the build system specifies the
policydb version that the policy is compiled with.
security_policyvers() specifies the maximum
policy version that the kernel is compatible with.
Allow POLICYVERS <= security_policyvers() to be considered
compatible.
This changes compatibility check logic for RuntimeInfo,
hence this does not affect OTA, except the following
case:
* device kernel reports 30
* new images are built with POLICYVERS=31
* fwk matrix has 31
* device do OTA with these images
* OTA will fail
Right now, since there are no plans to bump POLICYVERS
in build system (and it stays 30), OTA won't break.
Bug: 77886167
Test: vts_treble_vintf_test
Change-Id: I91fb631b291d17e26ad1a9befb669aac6b7ed654
Merged-In: I91fb631b291d17e26ad1a9befb669aac6b7ed654
Cleanup global FileFetcher am: 10d862283d
am: 37e129c359
Change-Id: Id6b0fa2fe92f7501a8801da42d0fc183f996410f
am: 37e129c359
Change-Id: Id6b0fa2fe92f7501a8801da42d0fc183f996410f
Cleanup global FileFetcher
This global instance is modifiable everywhere and
is hard to maintain. It also contains references as
out-variables, which is not the standard.
Clean it up by refactoring it into a public (i.e.
not in details namespace) class, FileSystem.
Introduce VintfObject::InitFileSystem that allows
the behavior to be changed before any files are read.
Bug: 37999212
Test: host and target libvintf_test, vintf_object_test
Change-Id: I1c64b31fd37119450be89dfd1d2bfe76a71ccf3d
Merged-In: I1c64b31fd37119450be89dfd1d2bfe76a71ccf3d
This global instance is modifiable everywhere and
is hard to maintain. It also contains references as
out-variables, which is not the standard.
Clean it up by refactoring it into a public (i.e.
not in details namespace) class, FileSystem.
Introduce VintfObject::InitFileSystem that allows
the behavior to be changed before any files are read.
Bug: 37999212
Test: host and target libvintf_test, vintf_object_test
Change-Id: I1c64b31fd37119450be89dfd1d2bfe76a71ccf3d
Merged-In: I1c64b31fd37119450be89dfd1d2bfe76a71ccf3d
libvintf_recovery: to Soong am: 00611d5483
am: 7555b2aa30
Change-Id: I0bd45ec580d75f04f3044e222217e88d41e4789f
am: 7555b2aa30
Change-Id: I0bd45ec580d75f04f3044e222217e88d41e4789f
libvintf_recovery: to Soong
Now that libfs_mgr is in Soong, this can be in Soong
too.
Test: builds
Test: boot to recovery
Change-Id: I3e7751505052731ada97845a66cbf3fa1434ed7a
Now that libfs_mgr is in Soong, this can be in Soong
too.
Test: builds
Test: boot to recovery
Change-Id: I3e7751505052731ada97845a66cbf3fa1434ed7a
Merge "Support for fragmented manifests." am: a10930e9fc
am: 1911da5ddf
Change-Id: I15d8d12e8b09e160e9ed8786dcd271f55eaa89e5
am: 1911da5ddf
Change-Id: I15d8d12e8b09e160e9ed8786dcd271f55eaa89e5
Merge "Support for fragmented manifests."
am: a10930e9fc
Change-Id: I7da787cd4081ebc87141206503fd329bbe4b7bec
am: a10930e9fc
Change-Id: I7da787cd4081ebc87141206503fd329bbe4b7bec
Merge "Support for fragmented manifests."
Always include file names in assembled xmls. am: 5875afcd60
am: 79dcd7dfcc
Change-Id: I2a41e816f80f0be4fbbd558b1a829fbc8131f8f4
am: 79dcd7dfcc
Change-Id: I2a41e816f80f0be4fbbd558b1a829fbc8131f8f4
assemble_vintf: documentation -i can be duplicated am: 34f7405eb5
am: f253c0ac0d
Change-Id: I06162c5f6ed044da37984e2575b42cc90213cb00
am: f253c0ac0d
Change-Id: I06162c5f6ed044da37984e2575b42cc90213cb00
Always include file names in assembled xmls.
am: 5875afcd60
Change-Id: I066122b50a93659b04795dc31e4c6a876f13c89a
am: 5875afcd60
Change-Id: I066122b50a93659b04795dc31e4c6a876f13c89a
assemble_vintf: documentation -i can be duplicated
am: 34f7405eb5
Change-Id: I0459f5ef845f26f69c24732598eae0cf78cd57d6
am: 34f7405eb5
Change-Id: I0459f5ef845f26f69c24732598eae0cf78cd57d6
Always include file names in assembled xmls.
With fragments becoming more popular and build
system support for them on the way, this is useful
for debugging.
Change-Id: Ida7631dc0f314739aa1b275a6aee0264972c0f21
Fixes: 77640776
Test: libvintf_test
With fragments becoming more popular and build
system support for them on the way, this is useful
for debugging.
Change-Id: Ida7631dc0f314739aa1b275a6aee0264972c0f21
Fixes: 77640776
Test: libvintf_test
assemble_vintf: documentation -i can be duplicated
-i can be used multiple times, but this isn't documented.
Bug: N/A
Test: assemble_vintf -h
Change-Id: I8ce9e64465d72d6d8d3e300b28fa6b1d2788c253
-i can be used multiple times, but this isn't documented.
Bug: N/A
Test: assemble_vintf -h
Change-Id: I8ce9e64465d72d6d8d3e300b28fa6b1d2788c253
Support for fragmented manifests.
Bug: 66917623
Test: vintf_object_test (host + device)
Test: libvintf_test (host + device)
Test: boot device which is depending on fragments
Change-Id: Iab0c1e3a2031029c155c08a1cec7079537756a43
Bug: 66917623
Test: vintf_object_test (host + device)
Test: libvintf_test (host + device)
Test: boot device which is depending on fragments
Change-Id: Iab0c1e3a2031029c155c08a1cec7079537756a43
Snap for 4693621 from 9adf115f40240d1f8bfd0266c2445f7a9b3e0262 to pi-release
Change-Id: Ic74c65776067394e5aa7860265311b62421eb6f8
Change-Id: Ic74c65776067394e5aa7860265311b62421eb6f8
[automerger skipped] assemble_vintf: Add checkUnusedHals
am: 9adf115f40 -s ours
Change-Id: I650ab98aec74c823fdc143fd7800ca4116f4f1fb
am: 9adf115f40 -s ours
Change-Id: I650ab98aec74c823fdc143fd7800ca4116f4f1fb
[automerger skipped] assmeble_vintf: IGNORE_TARGET_FCM_VERSION -> VINTF_*
am: 73fad5fa12 -s ours
Change-Id: Ie78765a4379b07addca1bcc2b6082d29b1f05e85
am: 73fad5fa12 -s ours
Change-Id: Ie78765a4379b07addca1bcc2b6082d29b1f05e85
assemble_vintf: Add checkUnusedHals am: 1044fd17d5
am: 26685fc891
Change-Id: Ied3022960c6ea7df69689a5081a9ec836fb6ee6e
am: 26685fc891
Change-Id: Ied3022960c6ea7df69689a5081a9ec836fb6ee6e
assmeble_vintf: IGNORE_TARGET_FCM_VERSION -> VINTF_* am: 2eee19803a
am: 747f2ec0ae
Change-Id: Ib46b050fed4f75a82c7a198e4e0678823cc2ea7e
am: 747f2ec0ae
Change-Id: Ib46b050fed4f75a82c7a198e4e0678823cc2ea7e
assemble_vintf: Add checkUnusedHals
am: 1044fd17d5
Change-Id: I0acac352df2dc603b651fd41ec4fb857fca12112
am: 1044fd17d5
Change-Id: I0acac352df2dc603b651fd41ec4fb857fca12112
assmeble_vintf: IGNORE_TARGET_FCM_VERSION -> VINTF_*
am: 2eee19803a
Change-Id: I8b3a2c250ec68acde4bdf182302dd0e5bea25361
am: 2eee19803a
Change-Id: I8b3a2c250ec68acde4bdf182302dd0e5bea25361
assemble_vintf: Add checkUnusedHals
Test: m framework_compatibility_matrix.xml device_manifest.xml
Bug: 65028233
Change-Id: I466c60573676e8bf3a0d8d97000c380bdfec4b58
Merged-In: I466c60573676e8bf3a0d8d97000c380bdfec4b58
Test: m framework_compatibility_matrix.xml device_manifest.xml
Bug: 65028233
Change-Id: I466c60573676e8bf3a0d8d97000c380bdfec4b58
Merged-In: I466c60573676e8bf3a0d8d97000c380bdfec4b58
assmeble_vintf: IGNORE_TARGET_FCM_VERSION -> VINTF_*
All "private" environment variables to assemble_vintf
(inserted by the build rules, not build system variables)
should have this prefix (to distinguish against,
e.g. PRODUCT_ENFORCE_VINTF_MANIFEST)
Test: m framework_compatibility_matrix -j
Test: libvintf_test
Bug: 65028233
Change-Id: Iba44bd6d5d9a62b61666bcf5db672482d6f36488
Merged-In: Iba44bd6d5d9a62b61666bcf5db672482d6f36488
All "private" environment variables to assemble_vintf
(inserted by the build rules, not build system variables)
should have this prefix (to distinguish against,
e.g. PRODUCT_ENFORCE_VINTF_MANIFEST)
Test: m framework_compatibility_matrix -j
Test: libvintf_test
Bug: 65028233
Change-Id: Iba44bd6d5d9a62b61666bcf5db672482d6f36488
Merged-In: Iba44bd6d5d9a62b61666bcf5db672482d6f36488
assemble_vintf: Add checkUnusedHals
Test: m framework_compatibility_matrix.xml device_manifest.xml
Bug: 65028233
Change-Id: I466c60573676e8bf3a0d8d97000c380bdfec4b58
Merged-In: I466c60573676e8bf3a0d8d97000c380bdfec4b58
Test: m framework_compatibility_matrix.xml device_manifest.xml
Bug: 65028233
Change-Id: I466c60573676e8bf3a0d8d97000c380bdfec4b58
Merged-In: I466c60573676e8bf3a0d8d97000c380bdfec4b58
assmeble_vintf: IGNORE_TARGET_FCM_VERSION -> VINTF_*
All "private" environment variables to assemble_vintf
(inserted by the build rules, not build system variables)
should have this prefix (to distinguish against,
e.g. PRODUCT_ENFORCE_VINTF_MANIFEST)
Test: m framework_compatibility_matrix -j
Test: libvintf_test
Bug: 65028233
Change-Id: Iba44bd6d5d9a62b61666bcf5db672482d6f36488
All "private" environment variables to assemble_vintf
(inserted by the build rules, not build system variables)
should have this prefix (to distinguish against,
e.g. PRODUCT_ENFORCE_VINTF_MANIFEST)
Test: m framework_compatibility_matrix -j
Test: libvintf_test
Bug: 65028233
Change-Id: Iba44bd6d5d9a62b61666bcf5db672482d6f36488
Snap for 4686875 from 9295851019e7f8c4ecec7fa07ca5c9d7f0278ffe to pi-release
Change-Id: Ia053172ff699ca89fd5e86e3d460445978432988
Change-Id: Ia053172ff699ca89fd5e86e3d460445978432988
[automerger skipped] assemble_vintf supports DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILES
am: 9295851019 -s ours
Change-Id: Ib550dccd645776df0e157434e34518519fbaec17
am: 9295851019 -s ours
Change-Id: Ib550dccd645776df0e157434e34518519fbaec17
assemble_vintf supports DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILES am: 1e6e34c183
am: d7b34186ad
Change-Id: Id66df9cc1677e780fef712eb3b90286f5a3057c2
am: d7b34186ad
Change-Id: Id66df9cc1677e780fef712eb3b90286f5a3057c2
assemble_vintf supports DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILES
am: 1e6e34c183
Change-Id: Ia0a9be07449d0e538aaabcf644b277363d74e9ec
am: 1e6e34c183
Change-Id: Ia0a9be07449d0e538aaabcf644b277363d74e9ec
assemble_vintf supports DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILES
Relax multiple cases that were previously flagged as error
to allow combining matrices that doesn't have a "level"
attribute. Specifically, all HALs in matrices without a specific
FCM version are added as-is.
Test: m framework_compatibility_matrix.xml -j
Test: libvintf_test
Test: vintf_object_test
Bug: 65028233
Change-Id: Ifa947529731ab17d705be945139de504db2d0253
Merged-In: Ifa947529731ab17d705be945139de504db2d0253
Relax multiple cases that were previously flagged as error
to allow combining matrices that doesn't have a "level"
attribute. Specifically, all HALs in matrices without a specific
FCM version are added as-is.
Test: m framework_compatibility_matrix.xml -j
Test: libvintf_test
Test: vintf_object_test
Bug: 65028233
Change-Id: Ifa947529731ab17d705be945139de504db2d0253
Merged-In: Ifa947529731ab17d705be945139de504db2d0253
assemble_vintf supports DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILES
Relax multiple cases that were previously flagged as error
to allow combining matrices that doesn't have a "level"
attribute. Specifically, all HALs in matrices without a specific
FCM version are added as-is.
Test: m framework_compatibility_matrix.xml -j
Test: libvintf_test
Test: vintf_object_test
Bug: 65028233
Change-Id: Ifa947529731ab17d705be945139de504db2d0253
Relax multiple cases that were previously flagged as error
to allow combining matrices that doesn't have a "level"
attribute. Specifically, all HALs in matrices without a specific
FCM version are added as-is.
Test: m framework_compatibility_matrix.xml -j
Test: libvintf_test
Test: vintf_object_test
Bug: 65028233
Change-Id: Ifa947529731ab17d705be945139de504db2d0253
Snap for 4677756 from bb86f253002a9c3d3ff3bd55f1c219c0f7a53738 to pi-release
Change-Id: I5483e61588a71e7cd1734b39313c3af1a6ff70c0
Change-Id: I5483e61588a71e7cd1734b39313c3af1a6ff70c0
[automerger skipped]regex-instance: tests for regex instances
am: bb86f25300 -s ours
Change-Id: If02878c543ef8c26842760fc1d5417e4abf5b8c9
am: bb86f25300 -s ours
Change-Id: If02878c543ef8c26842760fc1d5417e4abf5b8c9
[automerger skipped]regex-instance: Fix CompatibilityMatrix::combine to use regex API
am: 92dae04c84 -s ours
Change-Id: Ia125ec61162acbf109bc0de1bcec74e18f0bac0f
am: 92dae04c84 -s ours
Change-Id: Ia125ec61162acbf109bc0de1bcec74e18f0bac0f
[automerger skipped]Remove CompatibilityMatrix::getInstances/hasInstance
am: 79ddcd2769 -s ours
Change-Id: I1040adabc0f0619e90c52b79c225e57a9e78e37e
am: 79ddcd2769 -s ours
Change-Id: I1040adabc0f0619e90c52b79c225e57a9e78e37e
[automerger skipped]regex-instance: Fix check deprecate test
am: da27684431 -s ours
Change-Id: I889c47d09c84e454bb10f6a7ed7855a2db73d66c
am: da27684431 -s ours
Change-Id: I889c47d09c84e454bb10f6a7ed7855a2db73d66c
[automerger skipped]regex-instance: HalInterface stores regex instances.
am: 2b93dbe7e1 -s ours
Change-Id: Ife9bb6417148eb8fbbaab61c76cb9801bba398ca
am: 2b93dbe7e1 -s ours
Change-Id: Ife9bb6417148eb8fbbaab61c76cb9801bba398ca
[automerger skipped]regex-instance: HalInterface: add regex API and hide public fields
am: 6e82b11892 -s ours
Change-Id: I8a6f607a7433cbee1ebd37dc92c904d779c8dfc6
am: 6e82b11892 -s ours
Change-Id: I8a6f607a7433cbee1ebd37dc92c904d779c8dfc6
[automerger skipped]regex-instance: MatrixInstance: add regex API.
am: b80f323062 -s ours
Change-Id: I49cad937dc2e961989d5dae267fb4e7c6b9286e3
am: b80f323062 -s ours
Change-Id: I49cad937dc2e961989d5dae267fb4e7c6b9286e3
[automerger skipped]Remove MatrixHal::getInstances
am: e5bd963fe2 -s ours
Change-Id: I7a59950fe35f22fbc284ac9c639a45db5163265a
am: e5bd963fe2 -s ours
Change-Id: I7a59950fe35f22fbc284ac9c639a45db5163265a
regex-instance: tests for regex instances am: 29660e0330
am: d0ce9f137a
Change-Id: I150e08b1efc67f1bddcd4f7066fa703f0db391aa
am: d0ce9f137a
Change-Id: I150e08b1efc67f1bddcd4f7066fa703f0db391aa
regex-instance: Fix CompatibilityMatrix::combine to use regex API am: 643a9ef713
am: 6f848eb436
Change-Id: If083beb92e6e5c88b84f311e1766cd5946899302
am: 6f848eb436
Change-Id: If083beb92e6e5c88b84f311e1766cd5946899302
Remove CompatibilityMatrix::getInstances/hasInstance am: def7e7f8b7
am: f0630d9969
Change-Id: Ifab4953da97aada398d80a9df96495ab1edc42fe
am: f0630d9969
Change-Id: Ifab4953da97aada398d80a9df96495ab1edc42fe
regex-instance: Fix check deprecate test am: a8a8fa9e6d
am: 25368b02e7
Change-Id: I98bf1d04e5edc3bc74aa1789c96af93823a6d614
am: 25368b02e7
Change-Id: I98bf1d04e5edc3bc74aa1789c96af93823a6d614
regex-instance: HalInterface stores regex instances. am: 705216b831
am: 0d99afb4fc
Change-Id: I2a0046930beb6d9f046640c9de6b602d676cf2e9
am: 0d99afb4fc
Change-Id: I2a0046930beb6d9f046640c9de6b602d676cf2e9
regex-instance: HalInterface: add regex API and hide public fields am: 7e9e04d10d
am: c11a9a64ab
Change-Id: I6df5ce4126d673ea68e5c355427cf5f72f1dd546
am: c11a9a64ab
Change-Id: I6df5ce4126d673ea68e5c355427cf5f72f1dd546
regex-instance: MatrixInstance: add regex API. am: 85103c60a4
am: 5d3a1b56fc
Change-Id: Iee3bdb4b3731c76915a4f4b9569769272208bc61
am: 5d3a1b56fc
Change-Id: Iee3bdb4b3731c76915a4f4b9569769272208bc61
Remove MatrixHal::getInstances am: 3eb71e9430
am: 07cfb65b11
Change-Id: I33d0c77f8a597523706c91a5dc1452ad449006ef
am: 07cfb65b11
Change-Id: I33d0c77f8a597523706c91a5dc1452ad449006ef
regex-instance: tests for regex instances
am: 29660e0330
Change-Id: Ica1cea61fd1d7dd18be718ce60ce96196525c1eb
am: 29660e0330
Change-Id: Ica1cea61fd1d7dd18be718ce60ce96196525c1eb
regex-instance: Fix CompatibilityMatrix::combine to use regex API
am: 643a9ef713
Change-Id: I2ac02f0e7fc414ad65ba85fbac6fd7790ae611f7
am: 643a9ef713
Change-Id: I2ac02f0e7fc414ad65ba85fbac6fd7790ae611f7
Remove CompatibilityMatrix::getInstances/hasInstance
am: def7e7f8b7
Change-Id: Ie6e81a3fdba62476916e2c86401892fe9eca7b21
am: def7e7f8b7
Change-Id: Ie6e81a3fdba62476916e2c86401892fe9eca7b21
regex-instance: Fix check deprecate test
am: a8a8fa9e6d
Change-Id: Ie72d5e16adeb1d1e8afa072ba4d2e78f5e124fee
am: a8a8fa9e6d
Change-Id: Ie72d5e16adeb1d1e8afa072ba4d2e78f5e124fee
regex-instance: HalInterface stores regex instances.
am: 705216b831
Change-Id: I9e756da54b641e9d5f11fe2acc892b117c61b854
am: 705216b831
Change-Id: I9e756da54b641e9d5f11fe2acc892b117c61b854
regex-instance: HalInterface: add regex API and hide public fields
am: 7e9e04d10d
Change-Id: I586972b203367b6b6c17aa8c9d0bf3eec4872ef9
am: 7e9e04d10d
Change-Id: I586972b203367b6b6c17aa8c9d0bf3eec4872ef9