p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move VarType out of its respective outer classes. 

It's used more than I originally thought it would be and it's
unnecessarily nested.

Test: rm -rf out/config/ && m product-config-test product-config && java -jar out/host/linux-x86/testcases/product-config-test/product-config-test.jar && time ( product-config --ckati_bin /source/kati/ckati > ~/Desktop/out.txt )
Change-Id: Id5a075863151e37ec60e5d9dbeb817c2df245bc7
This commit is contained in:
Joe Onorato 2021-02-08 22:42:11 -08:00
parent d81abe7412
commit 2590206000
4 changed files with 45 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/product_config/src/com/android/build/config/ConfigBase.java
View File

@ -46,15 +46,6 @@ public class ConfigBase {
*/
protected final TreeMap<String, VarType> mProductVars = new TreeMap();
/**
* Whether a product config variable is a list or single-value variable.
*/
public enum VarType {
LIST,
SINGLE,
UNKNOWN // For non-product vars
}
public void setPhase(String phase) {
mPhase = phase;
}
@ -112,7 +103,7 @@ public class ConfigBase {
public void copyFrom(ConfigBase that) {
setPhase(that.getPhase());
setRootNodes(that.getRootNodes());
for (Map.Entry<String, ConfigBase.VarType> entry: that.getProductVars().entrySet()) {
for (Map.Entry<String, VarType> entry: that.getProductVars().entrySet()) {
addProductVar(entry.getKey(), entry.getValue());
}
mInitialVariables = new HashMap(that.getInitialVariables());

4
tools/product_config/src/com/android/build/config/ConvertMakeToGenericConfig.java
View File

@ -107,7 +107,7 @@ public class ConvertMakeToGenericConfig {
* Converts one variable from a MakeConfig Block into a GenericConfig Assignment.
*/
GenericConfig.Assign convertAssignment(MakeConfig.BlockType blockType, Str inheritedFile,
ConfigBase.VarType varType, String varName, Str varVal, Str prevVal) {
VarType varType, String varName, Str varVal, Str prevVal) {
if (prevVal == null) {
// New variable.
return new GenericConfig.Assign(varName, varVal);
@ -120,7 +120,7 @@ public class ConvertMakeToGenericConfig {
// Product vars have the @inherit processing. Other vars we
// will just ignore and put in one section at the end, based
// on the difference between the BEFORE and AFTER blocks.
if (varType == ConfigBase.VarType.UNKNOWN) {
if (varType == VarType.UNKNOWN) {
if (blockType == MakeConfig.BlockType.AFTER) {
// For UNKNOWN variables, we don't worry about the
// intermediate steps, just take the final value.

3
tools/product_config/src/com/android/build/config/DumpConfigParser.java
View File

@ -140,8 +140,7 @@ public class DumpConfigParser {
System.out.println(" " + makeConfig.getRootNodes());
}
} else if (matchLineType(line, "var", 2)) {
final MakeConfig.VarType type = "list".equals(fields.get(1))
? MakeConfig.VarType.LIST : MakeConfig.VarType.SINGLE;
final VarType type = "list".equals(fields.get(1)) ? VarType.LIST : VarType.SINGLE;
makeConfig.addProductVar(fields.get(2), type);
if (DEBUG) {

41
tools/product_config/src/com/android/build/config/VarType.java Normal file
View File

@ -0,0 +1,41 @@
/*
* Copyright (C) 2020 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.
*/
package com.android.build.config;
/**
* Whether a product config variable is a list or single-value variable.
*/
public enum VarType {
/**
* A product config variable that is a list of space separated strings.
* These are defined by _product_single_value_vars in product.mk.
*/
LIST,
/**
* A product config varaible that is a single string.
* These are defined by _product_list_vars in product.mk.
*/
SINGLE,
/**
* A variable that is given the special product config handling but is
* nonetheless defined by product config makefiles.
*/
UNKNOWN
}