diff --git a/java/app.go b/java/app.go
index 574472c..249313c 100755
--- a/java/app.go
+++ b/java/app.go
@@ -905,8 +905,6 @@
 		&module.appProperties,
 		&module.overridableAppProperties)
 
-	module.usesLibrary.enforce = true
-
 	android.InitAndroidMultiTargetsArchModule(module, android.DeviceSupported, android.MultilibCommon)
 	android.InitDefaultableModule(module)
 	android.InitOverridableModule(module, &module.appProperties.Overrides)
@@ -1177,9 +1175,6 @@
 // with knowledge of their shared libraries.
 type usesLibrary struct {
 	usesLibraryProperties UsesLibraryProperties
-
-	// Whether to enforce verify_uses_library check.
-	enforce bool
 }
 
 func (u *usesLibrary) addLib(lib string, optional bool) {
@@ -1246,7 +1241,7 @@
 func (u *usesLibrary) enforceUsesLibraries() bool {
 	defaultEnforceUsesLibs := len(u.usesLibraryProperties.Uses_libs) > 0 ||
 		len(u.usesLibraryProperties.Optional_uses_libs) > 0
-	return BoolDefault(u.usesLibraryProperties.Enforce_uses_libs, u.enforce || defaultEnforceUsesLibs)
+	return BoolDefault(u.usesLibraryProperties.Enforce_uses_libs, defaultEnforceUsesLibs)
 }
 
 // Freeze the value of `enforce_uses_libs` based on the current values of `uses_libs` and `optional_uses_libs`.
