commit 8b8492bcc42b79d1a95b02808dfbb654e2e31690
author Yifan Hong <elsk@google.com> Mon Jan 22 14:08:40 2018 -0800
committer Yifan Hong <elsk@google.com> Mon Jan 22 14:17:33 2018 -0800
tree 6462df4bbbeab0e33edded5b5371b15dd911895b
parent 12a11ac2577e2dee57db250d21cf2ec1ae0f5ca2

AssembleVintf: PRODUCT_ => PLATFORM_ for system sdk versions

Test: libvintf_test
Bug: 69088799
Change-Id: Iafe51d06972760cd01df78acb79bcac421b53c8e

AssembleVintf.cpp

diff --git a/AssembleVintf.cpp b/AssembleVintf.cpp
index f7f1fb4..d17f1c5 100644
--- a/AssembleVintf.cpp
+++ b/AssembleVintf.cpp
@@ -306,7 +306,7 @@
                 halManifest->framework.mVendorNdks.emplace_back(std::move(v));
             }
 
-            for (auto&& v : getEnvList("PRODUCT_SYSTEMSDK_VERSIONS")) {
+            for (auto&& v : getEnvList("PLATFORM_SYSTEMSDK_VERSIONS")) {
                 halManifest->framework.mSystemSdk.mVersions.emplace(std::move(v));
             }
         }

test/AssembleVintfTest.cpp

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, ManifestSystemSdk) {
     addInput("manifest.xml", "<manifest version=\"1.0\" type=\"framework\"/>\n");
-    getInstance()->setFakeEnv("PRODUCT_SYSTEMSDK_VERSIONS", "P 1 2 ");
+    getInstance()->setFakeEnv("PLATFORM_SYSTEMSDK_VERSIONS", "P 1 2 ");
     EXPECT_TRUE(getInstance()->assemble());
     EXPECT_IN(
         "<manifest version=\"1.0\" type=\"framework\">\n"