30dc2e0171
To support allowing for multiple <overlay> tags in one package, idmap2 must be able to generate an idmap for an individual <overlay> tag. `idmap2 create` now accepts a --overlay-name flag that specifies which tag to use to generate the idmap. The value of --overlay-name should be set to the value of the android:name attribute on the <overlay> tag to use. If the flag is not present, idmap2 will look for an <overlay> tag with no value for android:name. Bug: 162841629 Test: libandroidfw_tests Test: libidmap2_tests Change-Id: I02316d0b88773f02c04a5d462be9825016fa496d
83 lines
3.0 KiB
C++
83 lines
3.0 KiB
C++
/*
|
|
* Copyright (C) 2018 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#include <memory>
|
|
#include <string>
|
|
|
|
#include "R.h"
|
|
#include "TestConstants.h"
|
|
#include "TestHelpers.h"
|
|
#include "androidfw/ApkAssets.h"
|
|
#include "androidfw/ResourceTypes.h"
|
|
#include "gmock/gmock.h"
|
|
#include "gtest/gtest.h"
|
|
#include "idmap2/Idmap.h"
|
|
#include "idmap2/PrettyPrintVisitor.h"
|
|
|
|
using android::ApkAssets;
|
|
using android::base::StringPrintf;
|
|
using ::testing::NotNull;
|
|
|
|
using PolicyBitmask = android::ResTable_overlayable_policy_header::PolicyBitmask;
|
|
using PolicyFlags = android::ResTable_overlayable_policy_header::PolicyFlags;
|
|
|
|
namespace android::idmap2 {
|
|
|
|
TEST(PrettyPrintVisitorTests, CreatePrettyPrintVisitor) {
|
|
const std::string target_apk_path(GetTestDataPath() + "/target/target.apk");
|
|
std::unique_ptr<const ApkAssets> target_apk = ApkAssets::Load(target_apk_path);
|
|
ASSERT_THAT(target_apk, NotNull());
|
|
|
|
const std::string overlay_apk_path(GetTestDataPath() + "/overlay/overlay.apk");
|
|
std::unique_ptr<const ApkAssets> overlay_apk = ApkAssets::Load(overlay_apk_path);
|
|
ASSERT_THAT(overlay_apk, NotNull());
|
|
|
|
const auto idmap = Idmap::FromApkAssets(*target_apk, *overlay_apk,
|
|
TestConstants::OVERLAY_NAME_DEFAULT, PolicyFlags::PUBLIC,
|
|
/* enforce_overlayable */ true);
|
|
ASSERT_TRUE(idmap);
|
|
|
|
std::stringstream stream;
|
|
PrettyPrintVisitor visitor(stream);
|
|
(*idmap)->accept(&visitor);
|
|
|
|
ASSERT_NE(stream.str().find("target apk path : "), std::string::npos);
|
|
ASSERT_NE(stream.str().find("overlay apk path : "), std::string::npos);
|
|
ASSERT_NE(stream.str().find(StringPrintf("0x%08x -> 0x%08x (integer/int1 -> integer/int1)\n",
|
|
R::target::integer::int1, R::overlay::integer::int1)),
|
|
std::string::npos);
|
|
}
|
|
|
|
TEST(PrettyPrintVisitorTests, CreatePrettyPrintVisitorWithoutAccessToApks) {
|
|
fclose(stderr); // silence expected warnings from libandroidfw
|
|
|
|
std::string raw(reinterpret_cast<const char*>(idmap_raw_data), kIdmapRawDataLen);
|
|
std::istringstream raw_stream(raw);
|
|
|
|
const auto idmap = Idmap::FromBinaryStream(raw_stream);
|
|
ASSERT_TRUE(idmap);
|
|
|
|
std::stringstream stream;
|
|
PrettyPrintVisitor visitor(stream);
|
|
(*idmap)->accept(&visitor);
|
|
|
|
ASSERT_NE(stream.str().find("target apk path : "), std::string::npos);
|
|
ASSERT_NE(stream.str().find("overlay apk path : "), std::string::npos);
|
|
ASSERT_NE(stream.str().find("0x7f020000 -> 0x7f020000 (\?\?\? -> \?\?\?)\n"), std::string::npos);
|
|
}
|
|
|
|
} // namespace android::idmap2
|