Merge changes I9e73c0b8,Iac5c4327,Idf6fbc94 am: 7307de5e0c am: 4aa10a3cc5

am: 1033e0516b

Change-Id: I208a549fc8dd99fb511327a1c9c4d07e4f6cf54b
This commit is contained in:
Colin Cross
2018-10-01 19:38:25 -07:00
committed by android-build-merger
3 changed files with 47 additions and 33 deletions

View File

@@ -12,6 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
ifndef ONE_SHOT_MAKEFILE
.PHONY: sdk_addon
# If they didn't define PRODUCT_SDK_ADDON_NAME, then we won't define
@@ -148,3 +150,5 @@ ifneq ($(filter sdk_addon,$(MAKECMDGOALS)),)
$(error Trying to build sdk_addon, but product '$(INTERNAL_PRODUCT)' does not define one)
endif
endif # addon_name
endif # !ONE_SHOT_MAKEFILE