Merge "AAPT2: Allow multiple -c flags" into oc-dev (7a7e4159) · Commits · e / os / android_frameworks_base

tools/aapt2/link/Link.cpp

+22 −21

Original line number	Diff line number	Diff line
		@@ -1913,7 +1913,7 @@ int Link(const std::vector<StringPiece>& args) {
		std::vector<std::string> overlay_arg_list;
		std::vector<std::string> extra_java_packages;
		Maybe<std::string> package_id;
		Maybe<std::string> configs;
		std::vector<std::string> configs;
		Maybe<std::string> preferred_density;
		Maybe<std::string> product_list;
		bool legacy_x_flag = false;
		@@ -1971,7 +1971,7 @@ int Link(const std::vector<StringPiece>& args) {
		&legacy_x_flag)
		.OptionalSwitch("-z", "Require localization of strings marked 'suggested'",
		&require_localization)
		.OptionalFlag("-c",
		.OptionalFlagList("-c",
		"Comma separated list of configurations to include. The default\n"
		"is all configurations",
		&configs)
		@@ -2151,8 +2151,9 @@ int Link(const std::vector<StringPiece>& args) {
		}

		AxisConfigFilter filter;
		if (configs) {
		for (const StringPiece& config_str : util::Tokenize(configs.value(), ',')) {
		if (configs.empty()) {
		for (const std::string& config_arg : configs) {
		for (const StringPiece& config_str : util::Tokenize(config_arg, ',')) {
		ConfigDescription config;
		LocaleValue lv;
		if (lv.InitFromFilterString(config_str)) {
		@@ -2172,7 +2173,7 @@ int Link(const std::vector<StringPiece>& args) {
		filter.AddConfig(config);
		}
		}

		}
		options.table_splitter_options.config_filter = &filter;
		}