am 002f5377: Apply --extra-packages in case --custom-pacakge is also specified. (532d2c70) · Commits · e / os / android_frameworks_base

tools/aapt/Command.cpp

+17 −14

Original line number	Diff line number	Diff line
		@@ -1740,6 +1740,13 @@ int doPackage(Bundle* bundle)
		// Write the R.java file into the appropriate class directory
		// e.g. gen/com/foo/app/R.java
		err = writeResourceSymbols(bundle, assets, assets->getPackage(), true);
		} else {
		const String8 customPkg(bundle->getCustomPackage());
		err = writeResourceSymbols(bundle, assets, customPkg, true);
		}
		if (err < 0) {
		goto bail;
		}
		// If we have library files, we're going to write our R.java file into
		// the appropriate class directory for those libraries as well.
		// e.g. gen/com/foo/app/lib/R.java
		@@ -1750,17 +1757,13 @@ int doPackage(Bundle* bundle)
		while (packageString != NULL) {
		// Write the R.java file out with the correct package name
		err = writeResourceSymbols(bundle, assets, String8(packageString), true);
		if (err < 0) {
		goto bail;
		}
		packageString = strtok(NULL, ":");
		}
		libs.unlockBuffer();
		}
		} else {
		const String8 customPkg(bundle->getCustomPackage());
		err = writeResourceSymbols(bundle, assets, customPkg, true);
		}
		if (err < 0) {
		goto bail;
		}
		} else {
		err = writeResourceSymbols(bundle, assets, assets->getPackage(), false);
		if (err < 0) {