d6b83299a6
AAPT would accept files with multiple periods in the filename as input. This lead to cases explained in b/74999475. This change adds error messages for files with multiple periods unless the legacy flag is present. With the legacy flag present, AAPT2 will behave like AAPT rather than throwing an error. Test: Added tests to aapt2_tests Bug: 73071563 Bug: 74999475 Change-Id: I28dfceeea7b39f8e4b9e6671e0fc8793cf388f52
96 lines
3.9 KiB
C++
96 lines
3.9 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 "Compile.h"
|
|
|
|
#include "android-base/file.h"
|
|
#include "io/StringStream.h"
|
|
#include "java/AnnotationProcessor.h"
|
|
#include "test/Test.h"
|
|
|
|
namespace aapt {
|
|
|
|
int TestCompile(std::string path, std::string outDir, bool legacy, StdErrDiagnostics& diag) {
|
|
std::vector<android::StringPiece> args;
|
|
args.push_back(path);
|
|
args.push_back("-o");
|
|
args.push_back(outDir);
|
|
args.push_back("-v");
|
|
if (legacy) {
|
|
args.push_back("--legacy");
|
|
}
|
|
return aapt::Compile(args, &diag);
|
|
}
|
|
|
|
TEST(CompilerTest, MultiplePeriods) {
|
|
StdErrDiagnostics diag;
|
|
std::unique_ptr<IAaptContext> context = test::ContextBuilder().Build();
|
|
const std::string kResDir = android::base::Dirname(android::base::GetExecutablePath())
|
|
+ "/integration-tests/CompileTest/res";
|
|
|
|
// Resource files without periods in the file name should not throw errors
|
|
const std::string path0 = kResDir + "/values/values.xml";
|
|
const std::string path0_out = kResDir + "/values_values.arsc.flat";
|
|
|
|
remove(path0_out.c_str());
|
|
ASSERT_EQ(TestCompile(path0, kResDir, /** legacy */ false, diag), 0);
|
|
ASSERT_EQ(remove(path0_out.c_str()), 0);
|
|
ASSERT_EQ(TestCompile(path0, kResDir, /** legacy */ true, diag), 0);
|
|
ASSERT_EQ(remove(path0_out.c_str()), 0);
|
|
|
|
const std::string path1 = kResDir + "/drawable/image.png";
|
|
const std::string path1_out = kResDir + "/drawable_image.png.flat";
|
|
remove(path1_out.c_str());
|
|
ASSERT_EQ(TestCompile(path1, kResDir, /** legacy */ false, diag), 0);
|
|
ASSERT_EQ(remove(path1_out.c_str()), 0);
|
|
ASSERT_EQ(TestCompile(path1, kResDir, /** legacy */ true, diag), 0);
|
|
ASSERT_EQ(remove(path1_out.c_str()), 0);
|
|
|
|
const std::string path2 = kResDir + "/drawable/image.9.png";
|
|
const std::string path2_out = kResDir + "/drawable_image.9.png.flat";
|
|
remove(path2_out.c_str());
|
|
ASSERT_EQ(TestCompile(path2, kResDir, /** legacy */ false, diag), 0);
|
|
ASSERT_EQ(remove(path2_out.c_str()), 0);
|
|
ASSERT_EQ(TestCompile(path2, kResDir, /** legacy */ true, diag), 0);
|
|
ASSERT_EQ(remove(path2_out.c_str()), 0);
|
|
|
|
// Resource files with periods in the file name should fail on non-legacy compilations
|
|
const std::string path3 = kResDir + "/values/values.all.xml";
|
|
const std::string path3_out = kResDir + "/values_values.all.arsc.flat";
|
|
remove(path3_out.c_str());
|
|
ASSERT_NE(TestCompile(path3, kResDir, /** legacy */ false, diag), 0);
|
|
ASSERT_NE(remove(path3_out.c_str()), 0);
|
|
ASSERT_EQ(TestCompile(path3, kResDir, /** legacy */ true, diag), 0);
|
|
ASSERT_EQ(remove(path3_out.c_str()), 0);
|
|
|
|
const std::string path4 = kResDir + "/drawable/image.small.png";
|
|
const std::string path4_out = (kResDir + std::string("/drawable_image.small.png.flat")).c_str();
|
|
remove(path4_out.c_str());
|
|
ASSERT_NE(TestCompile(path4, kResDir, /** legacy */ false, diag), 0);
|
|
ASSERT_NE(remove(path4_out.c_str()), 0);
|
|
ASSERT_EQ(TestCompile(path4, kResDir, /** legacy */ true, diag), 0);
|
|
ASSERT_EQ(remove(path4_out.c_str()), 0);
|
|
|
|
const std::string path5 = kResDir + "/drawable/image.small.9.png";
|
|
const std::string path5_out = (kResDir + std::string("/drawable_image.small.9.png.flat")).c_str();
|
|
remove(path5_out.c_str());
|
|
ASSERT_NE(TestCompile(path5, kResDir, /** legacy */ false, diag), 0);
|
|
ASSERT_NE(remove(path5_out.c_str()), 0);
|
|
ASSERT_EQ(TestCompile(path5, kResDir, /** legacy */ true, diag), 0);
|
|
ASSERT_EQ(remove(path5_out.c_str()), 0);
|
|
}
|
|
|
|
} |