summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot2018-01-23 02:26:15 -0600
committerandroid-build-team Robot2018-01-23 02:26:15 -0600
commit0c2974566e6c7e2d6cf87f0f96c6d6e6cc5cbccb (patch)
tree6462df4bbbeab0e33edded5b5371b15dd911895b
parentc76217355000bfea34b338fd9d3bfd690b4ee6cf (diff)
parentf94cf20143b2ace9c49d198effb045e9320443fa (diff)
downloadplatform-system-libvintf-0c2974566e6c7e2d6cf87f0f96c6d6e6cc5cbccb.tar.gz
platform-system-libvintf-0c2974566e6c7e2d6cf87f0f96c6d6e6cc5cbccb.tar.xz
platform-system-libvintf-0c2974566e6c7e2d6cf87f0f96c6d6e6cc5cbccb.zip
Snap for 4560043 from f94cf20143b2ace9c49d198effb045e9320443fa to pi-release
Change-Id: Ib04f35f7a9f76fb01ee7b5d2b77bbea31a18ff10
-rw-r--r--AssembleVintf.cpp2
-rw-r--r--test/AssembleVintfTest.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/AssembleVintf.cpp b/AssembleVintf.cpp
index f7f1fb4..d17f1c5 100644
--- a/AssembleVintf.cpp
+++ b/AssembleVintf.cpp
@@ -306,7 +306,7 @@ class AssembleVintfImpl : public AssembleVintf {
306 halManifest->framework.mVendorNdks.emplace_back(std::move(v)); 306 halManifest->framework.mVendorNdks.emplace_back(std::move(v));
307 } 307 }
308 308
309 for (auto&& v : getEnvList("PRODUCT_SYSTEMSDK_VERSIONS")) { 309 for (auto&& v : getEnvList("PLATFORM_SYSTEMSDK_VERSIONS")) {
310 halManifest->framework.mSystemSdk.mVersions.emplace(std::move(v)); 310 halManifest->framework.mSystemSdk.mVersions.emplace(std::move(v));
311 } 311 }
312 } 312 }
diff --git a/test/AssembleVintfTest.cpp b/test/AssembleVintfTest.cpp
index 4e481ad..912a11d 100644
--- a/test/AssembleVintfTest.cpp
+++ b/test/AssembleVintfTest.cpp
@@ -374,7 +374,7 @@ TEST_F(AssembleVintfTest, MatrixSystemSdk) {
374 374
375TEST_F(AssembleVintfTest, ManifestSystemSdk) { 375TEST_F(AssembleVintfTest, ManifestSystemSdk) {
376 addInput("manifest.xml", "<manifest version=\"1.0\" type=\"framework\"/>\n"); 376 addInput("manifest.xml", "<manifest version=\"1.0\" type=\"framework\"/>\n");
377 getInstance()->setFakeEnv("PRODUCT_SYSTEMSDK_VERSIONS", "P 1 2 "); 377 getInstance()->setFakeEnv("PLATFORM_SYSTEMSDK_VERSIONS", "P 1 2 ");
378 EXPECT_TRUE(getInstance()->assemble()); 378 EXPECT_TRUE(getInstance()->assemble());
379 EXPECT_IN( 379 EXPECT_IN(
380 "<manifest version=\"1.0\" type=\"framework\">\n" 380 "<manifest version=\"1.0\" type=\"framework\">\n"