OSDN Git Service

(root) / android-x86 / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 021b292 b8759f4)
Merge "Soong: Read Android.soong.mk if skipping Android.mk" am: ea71c96894
authorDan Willemsen <dwillemsen@google.com>
Fri, 13 May 2016 23:58:48 +0000 (23:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 13 May 2016 23:58:48 +0000 (23:58 +0000)
am: b8759f4f4b

* commit 'b8759f4f4b060fe9c4dc60fa6d786949b81f4ca0':
  Soong: Read Android.soong.mk if skipping Android.mk

Change-Id: Ibc2622b8292cb33270fe89ee8fcae4cdeb6b60c9

1  2 
core/definitions.mk patch | diff1 | diff2 | blob | history

diff --cc core/definitions.mk
Simple merge
build
About OSDN
Find Software
Develop Software
Help